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-12 17:03:55 +03:00 committed by GitHub
parent d91f9e14e6
commit cc79125d3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,8 +151,8 @@
command: "{{ bin_dir}}/calicoctl config set asNumber {{ global_as_num }}" command: "{{ bin_dir}}/calicoctl config set asNumber {{ global_as_num }}"
run_once: true run_once: true
when: when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<') - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled - not calico_upgrade_enabled
- name: Calico | Disable node mesh (legacy) - name: Calico | Disable node mesh (legacy)
command: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off" command: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off"
@ -161,7 +161,6 @@
- calico_version_on_server.stdout|version_compare('v3.0.0', '<') - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled - not calico_upgrade_enabled
- nodeToMeshEnabled|default(True) - nodeToMeshEnabled|default(True)
run_once: true
- name: Calico | Configure peering with router(s) - name: Calico | Configure peering with router(s)
shell: > shell: >
@ -199,10 +198,10 @@
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ peers|default([]) }}" with_items: "{{ peers|default([]) }}"
when: when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<') - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled - not calico_upgrade_enabled
- peer_with_router|default(false) - peer_with_router|default(false)
- inventory_hostname in groups['k8s-cluster'] - inventory_hostname in groups['k8s-cluster']
- name: Calico | Configure peering with route reflectors - name: Calico | Configure peering with route reflectors
shell: > shell: >
@ -243,10 +242,10 @@
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ groups['calico-rr'] | default([]) }}" with_items: "{{ groups['calico-rr'] | default([]) }}"
when: when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<') - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled - not calico_upgrade_enabled
- peer_with_calico_rr|default(false) - peer_with_calico_rr|default(false)
- hostvars[item]['cluster_id'] == cluster_id - hostvars[item]['cluster_id'] == cluster_id
- name: Calico | Create calico manifests - name: Calico | Create calico manifests