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

Revert "pass cloud provider flag in all cases, not just openstack"

Browse Source 
This reverts commit f35e5e864f.
This commit is contained in:
Smana
2016-08-24 14:32:54 +02:00
parent 643b28f9d3
commit 346eca5748
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@@ -35,8 +35,6 @@ spec:
{% if cloud_provider is defined and cloud_provider == "openstack" %}
- --cloud-provider={{ cloud_provider }}
- --cloud-config={{ kube_config_dir }}/cloud_config
{% elif cloud_provider is defined %}
- --cloud-provider={{ cloud_provider }}
{% endif %}
- 2>&1 >> {{ kube_log_dir }}/kube-apiserver.log
volumeMounts:

6
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View File

@@ -17,11 +17,9 @@ spec:
- --root-ca-file={{ kube_cert_dir }}/ca.pem
- --enable-hostpath-provisioner={{ kube_hostpath_dynamic_provisioner }}
- --v={{ kube_log_level | default('2') }}
{% if cloud_provider is defined and cloud_provider == "openstack"%}
- --cloud-provider={{cloud_provider}}
{% if cloud_provider is defined and cloud_provider == "openstack" %}
- --cloud-provider=openstack
- --cloud-config={{ kube_config_dir }}/cloud_config
{% elif cloud_provider is defined %}
- --cloud-provider={{cloud_provider}}
{% endif %}
livenessProbe:
httpGet: