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

Update install.yml

Browse source
This commit is contained in:
Matthew Mosesohn 2018-09-13 12:04:53 +03:00 committed by GitHub
parent 1091e82327
commit 55d76ea3d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/network_plugin/calico/tasks/install.yml
View file

@ -101,7 +101,7 @@
run_once: true run_once: true
delegate_to: "{{ groups['kube-master'][0] }}" delegate_to: "{{ groups['kube-master'][0] }}"
when: when:
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') - calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>')
- 'calico_conf.stdout == "0"' - 'calico_conf.stdout == "0"'
- name: Calico | Configure calico network pool (legacy) - name: Calico | Configure calico network pool (legacy)
@ -180,7 +180,7 @@
with_items: with_items:
- "{{ peers|default([]) }}" - "{{ peers|default([]) }}"
when: when:
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') - calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>')
- peer_with_router|default(false) - peer_with_router|default(false)
- inventory_hostname in groups['k8s-cluster'] - inventory_hostname in groups['k8s-cluster']
@ -221,7 +221,7 @@
with_items: with_items:
- "{{ groups['calico-rr'] | default([]) }}" - "{{ groups['calico-rr'] | default([]) }}"
when: when:
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') - calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>')
- peer_with_calico_rr|default(false) - peer_with_calico_rr|default(false)
- inventory_hostname in groups['k8s-cluster'] - inventory_hostname in groups['k8s-cluster']
- hostvars[item]['cluster_id'] == cluster_id - hostvars[item]['cluster_id'] == cluster_id