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

Merge pull request #684 from adidenko/fix-calico-peering

Browse source 
Calico: fix peering with routers for new version
This commit is contained in:
Bogdan Dobrelya 2016-12-06 22:42:02 +01:00 committed by GitHub
commit 9d6cc3a8d5
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
roles/network_plugin/calico/tasks/main.yml
View file

@ -196,17 +196,18 @@
shell: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off" shell: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off"
when: (not legacy_calicoctl and when: (not legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['kube-node']) peer_with_router|default(false) and inventory_hostname in groups['kube-node'])
run_once: true
- name: Calico | Configure peering with router(s) - name: Calico | Configure peering with router(s)
shell: > shell: >
echo '{ echo '{
"kind": "bgppeer", "kind": "bgpPeer",
"spec": {"asNumber": {{ item.as }}}, "spec": {"asNumber": "{{ item.as }}"},
"apiVersion": "v1", "apiVersion": "v1",
"metadata": {"node": "rack1-host1", "scope": "node", "peerIP": "{{ item.router_id }}"} "metadata": {"node": "{{ inventory_hostname }}", "scope": "node", "peerIP": "{{ item.router_id }}"}
}' }'
| {{ bin_dir }}/calicoctl create -f - | {{ bin_dir }}/calicoctl create -f -
with_items: peers with_items: "{{ peers|default([]) }}"
when: (not legacy_calicoctl and when: (not legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['kube-node']) peer_with_router|default(false) and inventory_hostname in groups['kube-node'])
@ -214,9 +215,10 @@
shell: "{{ bin_dir }}/calicoctl bgp node-mesh off" shell: "{{ bin_dir }}/calicoctl bgp node-mesh off"
when: (legacy_calicoctl and when: (legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['kube-node']) peer_with_router|default(false) and inventory_hostname in groups['kube-node'])
run_once: true
- name: Calico (old) | Configure peering with router(s) - name: Calico (old) | Configure peering with router(s)
shell: "{{ bin_dir }}/calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}" shell: "{{ bin_dir }}/calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}"
with_items: peers with_items: "{{ peers|default([]) }}"
when: (legacy_calicoctl and when: (legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['kube-node']) peer_with_router|default(false) and inventory_hostname in groups['kube-node'])

1
roles/network_plugin/calico/templates/calico-node.service.j2
View file

@ -8,6 +8,7 @@ EnvironmentFile=/etc/calico/calico.env
ExecStartPre=-/usr/bin/docker rm -f calico-node ExecStartPre=-/usr/bin/docker rm -f calico-node
ExecStart=/usr/bin/docker run --net=host --privileged \ ExecStart=/usr/bin/docker run --net=host --privileged \
--name=calico-node \ --name=calico-node \
-e HOSTNAME=${CALICO_HOSTNAME} \
-e IP=${CALICO_IP} \ -e IP=${CALICO_IP} \
-e IP6=${CALICO_IP6} \ -e IP6=${CALICO_IP6} \
-e CALICO_NETWORKING_BACKEND=${CALICO_NETWORKING_BACKEND} \ -e CALICO_NETWORKING_BACKEND=${CALICO_NETWORKING_BACKEND} \

1
roles/network_plugin/calico/templates/calico.env.j2
View file

@ -12,3 +12,4 @@ CALICO_AS="{{ local_as }}"
{% endif %} {% endif %}
CALICO_NO_DEFAULT_POOLS="true" CALICO_NO_DEFAULT_POOLS="true"
CALICO_LIBNETWORK_ENABLED="true" CALICO_LIBNETWORK_ENABLED="true"
CALICO_HOSTNAME="{{ inventory_hostname }}"

1
roles/network_plugin/calico/templates/cni-calico.conf.j2
View file

@ -1,5 +1,6 @@
{ {
"name": "calico-k8s-network", "name": "calico-k8s-network",
"hostname": "{{ inventory_hostname }}",
"type": "calico", "type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}", "etcd_endpoints": "{{ etcd_access_endpoint }}",
"etcd_cert_file": "{{ etcd_cert_dir }}/node.pem", "etcd_cert_file": "{{ etcd_cert_dir }}/node.pem",