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

Merge pull request #944 from tureus/skip-cloud-config-on-etcd

Browse Source 
Bugfix: skip cloud_config on etcd
This commit is contained in:
Matthew Mosesohn
2017-01-30 20:12:36 +03:00
committed by GitHub
parent 71a3c97d6f e5fdc63bdd
commit e4eda88ca9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/preinstall/tasks/main.yml
View File

@@ -156,7 +156,7 @@
dest: "{{ kube_config_dir }}/cloud_config" dest: "{{ kube_config_dir }}/cloud_config"
group: "{{ kube_cert_group }}" group: "{{ kube_cert_group }}"
mode: 0640 mode: 0640
when: cloud_provider is defined and cloud_provider == "openstack" when: inventory_hostname in groups['k8s-cluster'] and cloud_provider is defined and cloud_provider == "openstack"
tags: [cloud-provider, openstack] tags: [cloud-provider, openstack]
- name: Write azure cloud-config - name: Write azure cloud-config
@@ -165,7 +165,7 @@
dest: "{{ kube_config_dir }}/cloud_config" dest: "{{ kube_config_dir }}/cloud_config"
group: "{{ kube_cert_group }}" group: "{{ kube_cert_group }}"
mode: 0640 mode: 0640
when: cloud_provider is defined and cloud_provider == "azure" when: inventory_hostname in groups['k8s-cluster'] and cloud_provider is defined and cloud_provider == "azure"
tags: [cloud-provider, azure] tags: [cloud-provider, azure]
- include: etchosts.yml - include: etchosts.yml