fix vsphere cloud provider handling

dersell · Nov 21, 2018 · cf32fd4 · cf32fd4
1 parent 39b4da0
commit cf32fd4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 46 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -99,6 +99,8 @@ kubernetes_cloud_vsphere_workspace_server: ""
 kubernetes_cloud_vsphere_workspace_datacenter: ""
 kubernetes_cloud_vsphere_workspace_default_datastore: ""
 kubernetes_cloud_vsphere_workspace_folder: ""
+kubernetes_cloud_vsphere_workspace_user: ""
+kubernetes_cloud_vsphere_workspace_password: ""
 kubernetes_cloud_vsphere_datacenters: []
 kubernetes_cloud_vsphere_network_options: []
 kubernetes_cloud_vsphere_disk_options: []
diff --git a/tasks/cloud_provider.yml b/tasks/cloud_provider.yml
diff --git a/templates/cloud-secret.yaml.j2 b/templates/cloud-secret.yaml.j2
diff --git a/templates/cloud.conf.j2 b/templates/cloud.conf.j2
@@ -8,13 +8,18 @@ secret-namespace = "kube-system"
 {% for dc in kubernetes_cloud_vsphere_datacenters %}
 [VirtualCenter "{{dc.server}}"]
 datacenters = "{{dc.datacenters}}"
+{% if dc.username is defined %}user = "{{dc.username}}"{% endif %}
+{% if dc.password is defined %}password = "{{dc.password}}"{% endif %}
 {% endfor %}
 
+
 [Workspace]
 server = {{ kubernetes_cloud_vsphere_workspace_server }}
 datacenter = {{ kubernetes_cloud_vsphere_workspace_datacenter }}
 default-datastore = {{ kubernetes_cloud_vsphere_workspace_default_datastore }}
 folder = {{ kubernetes_cloud_vsphere_workspace_folder }}
+user = "{{ kubernetes_cloud_vsphere_workspace_user }}"
+password = "{{ kubernetes_cloud_vsphere_workspace_password }}"
 
 [Disk]
 {% for do in kubernetes_cloud_vsphere_disk_options %}

diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -1,6 +1,6 @@
 ---
 
-  kubernetes_packages:
+kubernetes_packages:
   - name: kubelet-{{ kubernetes_version_rhel_package }}-0
     state: present
   - name: kubectl-{{ kubernetes_version_rhel_package }}-0