External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-19 12:10:11 -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

3
roles/kubernetes/node/templates/kubelet.j2
View File

@@ -33,9 +33,8 @@ DOCKER_SOCKET="--docker-endpoint=unix:/var/run/weave/weave.sock"
KUBE_ALLOW_PRIV="--allow-privileged=true"
{% if cloud_provider is defined and cloud_provider == "openstack" %}
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config"
{% elif cloud_provider is defined %}
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}"
{% else %}
{# TODO: gce and aws don't need the cloud provider to be set? #}
KUBELET_CLOUDPROVIDER=""
{% endif %}
{% if ansible_service_mgr in ["sysvinit","upstart"] %}