Browse Source

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

This reverts commit f35e5e864f.
pull/432/head
Smana 8 years ago
parent
commit
346eca5748
3 changed files with 3 additions and 8 deletions
  1. 2
      roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
  2. 6
      roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
  3. 3
      roles/kubernetes/node/templates/kubelet.j2

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

@ -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

@ -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:

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

@ -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"] %}

Loading…
Cancel
Save