C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1120 from bradbeam/fixtags

Browse source 
Removing cloud_provider tag to fix scenario where cloud_provider is n…
This commit is contained in:
Antoine Legrand 2017-03-06 19:00:41 +01:00 committed by GitHub
commit 7777b30693
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@
- include: "{{ cloud_provider }}-credential-check.yml" - include: "{{ cloud_provider }}-credential-check.yml"
when: cloud_provider is defined and cloud_provider in [ 'openstack', 'azure', 'vsphere' ] when: cloud_provider is defined and cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
tags: [cloud-provider, "{{ cloud_provider }}", facts] tags: [cloud-provider, facts]
- name: Create cni directories - name: Create cni directories
file: file:
@ -182,7 +182,7 @@
group: "{{ kube_cert_group }}" group: "{{ kube_cert_group }}"
mode: 0640 mode: 0640
when: inventory_hostname in groups['k8s-cluster'] and cloud_provider is defined and cloud_provider in [ 'openstack', 'azure', 'vsphere' ] when: inventory_hostname in groups['k8s-cluster'] and cloud_provider is defined and cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
tags: [cloud-provider, "{{ cloud_provider }}"] tags: [cloud-provider]
- include: etchosts.yml - include: etchosts.yml
tags: [bootstrap-os, etchosts] tags: [bootstrap-os, etchosts]