kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3340 from wwt/master 

Fixes Calico 3.x BGPPeer resources
pull/3333/merge
k8s-ci-robot 2018-09-19 04:43:35 -07:00 committed by GitHub
parent 118a7cd4ae fb1678d425
commit da4cc74498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/network_plugin/calico/tasks/install.yml
View File

@ -163,14 +163,13 @@
shell: > shell: >
echo '{ echo '{
"apiVersion": "projectcalico.org/v3", "apiVersion": "projectcalico.org/v3",
"kind": "bgpPeer", "kind": "BGPPeer",
"metadata": { "metadata": {
"name": "{{ inventory_hostname }}-bgp" "name": "{{ inventory_hostname }}-{{ item.router_id }}"
}, },
"spec": { "spec": {
"asNumber": "{{ item.as }}", "asNumber": "{{ item.as }}",
"node": "{{ inventory_hostname }}", "node": "{{ inventory_hostname }}",
"scope": "node",
"peerIP": "{{ item.router_id }}" "peerIP": "{{ item.router_id }}"
}}' | {{ bin_dir }}/calicoctl create --skip-exists -f - }}' | {{ bin_dir }}/calicoctl create --skip-exists -f -
retries: 4 retries: 4
@ -203,13 +202,12 @@
shell: > shell: >
echo '{ echo '{
"apiVersion": "projectcalico.org/v3", "apiVersion": "projectcalico.org/v3",
"kind": "bgpPeer", "kind": "BGPPeer",
"metadata": { "metadata": {
"name": "{{ inventory_hostname }}" "name": "{{ inventory_hostname }}-{{ hostvars[item]["calico_rr_ip"]|default(hostvars[item]["ip"])|default(hostvars[item]["ansible_default_ipv4"]["address"]) }}"
}, },
"spec": { "spec": {
"asNumber": "{{ local_as | default(global_as_num)}}", "asNumber": "{{ local_as | default(global_as_num)}}",
"scope": "node",
"node": "{{ inventory_hostname }}", "node": "{{ inventory_hostname }}",
"peerIP": "{{ hostvars[item]["calico_rr_ip"]|default(hostvars[item]["ip"])|default(hostvars[item]["ansible_default_ipv4"]["address"]) }}" "peerIP": "{{ hostvars[item]["calico_rr_ip"]|default(hostvars[item]["ip"])|default(hostvars[item]["ansible_default_ipv4"]["address"]) }}"
}}' | {{ bin_dir }}/calicoctl create --skip-exists -f - }}' | {{ bin_dir }}/calicoctl create --skip-exists -f -