From aaa27d0a345b7c79a7d8f334100e221754d14656 Mon Sep 17 00:00:00 2001
From: Brad Beam <bradbeam@users.noreply.github.com>
Date: Sat, 16 Sep 2017 02:43:47 -0500
Subject: [PATCH] Adding quotes around parameters in cloud_config (#1664)
This is to help support escapes and special characters
---
.../preinstall/templates/openstack-cloud-config.j2 | 12 ++++++------
.../preinstall/templates/vsphere-cloud-config.j2 | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/roles/kubernetes/preinstall/templates/openstack-cloud-config.j2 b/roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
index 55f6680e4..63e7262a0 100644
--- a/roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
+++ b/roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
@@ -1,11 +1,11 @@
[Global]
-auth-url={{ openstack_auth_url }}
-username={{ openstack_username }}
-password={{ openstack_password }}
-region={{ openstack_region }}
-tenant-id={{ openstack_tenant_id }}
+auth-url="{{ openstack_auth_url }}"
+username="{{ openstack_username }}"
+password="{{ openstack_password }}"
+region="{{ openstack_region }}"
+tenant-id="{{ openstack_tenant_id }}"
{% if openstack_domain_name is defined and openstack_domain_name != "" %}
-domain-name={{ openstack_domain_name }}
+domain-name="{{ openstack_domain_name }}"
{% endif %}
{% if openstack_blockstorage_version is defined %}
diff --git a/roles/kubernetes/preinstall/templates/vsphere-cloud-config.j2 b/roles/kubernetes/preinstall/templates/vsphere-cloud-config.j2
index c68ac0f55..ab58f7485 100644
--- a/roles/kubernetes/preinstall/templates/vsphere-cloud-config.j2
+++ b/roles/kubernetes/preinstall/templates/vsphere-cloud-config.j2
@@ -1,12 +1,12 @@
[Global]
-datacenter = {{ vsphere_datacenter }}
-datastore = {{ vsphere_datastore }}
+datacenter = "{{ vsphere_datacenter }}"
+datastore = "{{ vsphere_datastore }}"
insecure-flag = {{ vsphere_insecure }}
-password = {{ vsphere_password }}
+password = "{{ vsphere_password }}"
port = {{ vsphere_vcenter_port }}
-server = {{ vsphere_vcenter_ip }}
-user = {{ vsphere_user }}
-working-dir = {{ vsphere_working_dir }}
+server = "{{ vsphere_vcenter_ip }}"
+user = "{{ vsphere_user }}"
+working-dir = "{{ vsphere_working_dir }}"
{% if vsphere_vm_uuid is defined %}
vm-uuid = {{ vsphere_vm_uuid }}
{% endif %}
--
GitLab