epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2221 from Xuxe/patch-vcp-v1.9.2

Browse Source 
Updated vSphere cloud provider config for Kubernetes >= v1.9.2 and added resource pool deployment variable
This commit is contained in:
Spencer Smith
2018-01-31 16:06:07 -05:00
committed by GitHub
parent 5eedb5562f 7f79210ed1
commit c0a3bcf9b3
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
roles/kubernetes/preinstall/templates/vsphere-cloud-config.j2
View File

@@ -1,15 +1,36 @@
[Global]
datacenter = "{{ vsphere_datacenter }}"
datastore = "{{ vsphere_datastore }}"
insecure-flag = {{ vsphere_insecure }}
user = "{{ vsphere_user }}"
password = "{{ vsphere_password }}"
port = {{ vsphere_vcenter_port }}
server = "{{ vsphere_vcenter_ip }}"
user = "{{ vsphere_user }}"
insecure-flag = {{ vsphere_insecure }}
{% if kube_version | version_compare('v1.9.2', '>=') %}
datacenters = "{{ vsphere_datacenter }}"
{% else %}
datastore = "{{ vsphere_datastore }}"
datacenter = "{{ vsphere_datacenter }}"
working-dir = "{{ vsphere_working_dir }}"
{% if vsphere_vm_uuid is defined %}
vm-uuid = {{ vsphere_vm_uuid }}
server = "{{ vsphere_vcenter_ip }}"
{% if vsphere_vm_uuid is defined and vsphere_vm_uuid != "" %}
vm-uuid = "{{ vsphere_vm_uuid }}"
{% endif %}
{% endif %}
{% if kube_version | version_compare('v1.9.2', '>=') %}
[VirtualCenter "{{ vsphere_vcenter_ip }}"]
[Workspace]
server = "{{ vsphere_vcenter_ip }}"
datacenter = "{{ vsphere_datacenter }}"
folder = "{{ vsphere_working_dir }}"
default-datastore = "{{ vsphere_datastore }}"
{% if vsphere_resource_pool is defined and vsphere_resource_pool != "" %}
resourcepool-path = "{{ vsphere_resource_pool }}"
{% endif %}
{% endif %}
[Disk]
scsicontrollertype = {{ vsphere_scsi_controller_type }}
@@ -17,4 +38,4 @@ scsicontrollertype = {{ vsphere_scsi_controller_type }}
{% if vsphere_public_network is defined and vsphere_public_network != "" %}
[Network]
public-network = {{ vsphere_public_network }}
{% endif %}
{% endif %}