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

Fix calico peering with router(s) (#3547)

Browse source
This commit is contained in:
Erwan Miran 2018-10-24 07:19:50 +02:00 committed by k8s-ci-robot
parent 7e84de2ae1
commit 4f12ba00d1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,7 +221,7 @@
retries: 4 retries: 4
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: with_items:
- "{{ peers|rejectattr('scope','equalto', 'global')|default([]) }}" - "{{ peers|selectattr('scope','undefined')|list|default([]) | union(peers|selectattr('scope','defined')|selectattr('scope','equalto', 'node')|list|default([])) }}"
when: when:
- calico_version is version('v3.0.0', '>=') - calico_version is version('v3.0.0', '>=')
- peer_with_router|default(false) - peer_with_router|default(false)
@ -238,7 +238,7 @@
| {{ bin_dir }}/calicoctl create --skip-exists -f - | {{ bin_dir }}/calicoctl create --skip-exists -f -
retries: 4 retries: 4
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ peers|rejectattr('scope','equalto', 'global')|default([]) }}" with_items: "{{ peers|selectattr('scope','undefined')|list|default([]) | union(peers|selectattr('scope','defined')|selectattr('scope','equalto', 'node')|list|default([])) }}"
when: when:
- calico_version | version_compare('v3.0.0', '<') - calico_version | version_compare('v3.0.0', '<')
- peer_with_router|default(false) - peer_with_router|default(false)
@ -259,7 +259,7 @@
retries: 4 retries: 4
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: with_items:
- "{{ peers|selectattr('scope','equalto', 'global')|default([]) }}" - "{{ peers|selectattr('scope','defined')|selectattr('scope','equalto', 'global')|list|default([]) }}"
run_once: true run_once: true
when: when:
- calico_version | version_compare('v3.0.0', '>=') - calico_version | version_compare('v3.0.0', '>=')
@ -277,7 +277,7 @@
| {{ bin_dir }}/calicoctl create --skip-exists -f - | {{ bin_dir }}/calicoctl create --skip-exists -f -
retries: 4 retries: 4
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ peers|selectattr('scope','equalto', 'global')|default([]) }}" with_items: "{{ peers|selectattr('scope','defined')|selectattr('scope','equalto', 'global')|default([]) }}"
run_once: true run_once: true
when: when:
- calico_version is version('v3.0.0', '<') - calico_version is version('v3.0.0', '<')