External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-07-07 06:18:10 -02:30
Code Issues Packages Projects Releases Wiki Activity

remove unused code (#4981)

Browse Source
This commit is contained in:
刘旭
2019-07-16 16:39:24 +08:00
committed by Kubernetes Prow Robot
parent 99c5f7e013
commit de9443a694
36 changed files with 6 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
roles/kubernetes/node/templates/cloud-configs/vsphere-cloud-config.j2
View File

@@ -4,22 +4,7 @@ password = "{{ vsphere_password }}"
port = {{ vsphere_vcenter_port }}
insecure-flag = {{ vsphere_insecure }}
{% if kube_version is version('v1.9.2', '>=') %}
datacenters = "{{ vsphere_datacenter }}"
{% else %}
datastore = "{{ vsphere_datastore }}"
datacenter = "{{ vsphere_datacenter }}"
working-dir = "{{ vsphere_working_dir }}"
server = "{{ vsphere_vcenter_ip }}"
{% if vsphere_vm_uuid is defined and vsphere_vm_uuid != "" %}
vm-uuid = "{{ vsphere_vm_uuid }}"
{% endif %}
{% if vsphere_vm_name is defined and vsphere_vm_name != "" %}
vm-name = "{{ vsphere_vm_name }}"
{% endif %}
{% endif %}
{% if kube_version is version('v1.9.2', '>=') %}
[VirtualCenter "{{ vsphere_vcenter_ip }}"]
@@ -32,7 +17,6 @@ default-datastore = "{{ vsphere_datastore }}"
{% if vsphere_resource_pool is defined and vsphere_resource_pool != "" %}
resourcepool-path = "{{ vsphere_resource_pool }}"
{% endif %}
{% endif %}
[Disk]
@@ -43,7 +27,6 @@ scsicontrollertype = {{ vsphere_scsi_controller_type }}
public-network = {{ vsphere_public_network }}
{% endif %}
{% if kube_version is version('v1.12.0', '>=') %}
[Labels]
{% if vsphere_zone_category is defined and vsphere_zone_category != "" %}
zone = {{ vsphere_zone_category }}
@@ -51,4 +34,3 @@ zone = {{ vsphere_zone_category }}
{% if vsphere_region_category is defined and vsphere_region_category != "" %}
region = {{ vsphere_region_category }}
{% endif %}
{% endif %}