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

default value for 'peer_with_router'

Browse source
This commit is contained in:
Smaine Kahlouch 2015-11-02 13:41:03 +01:00
parent f6e4cc530c
commit 3fb9101e40
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/tasks/calico.yml
View file

@ -38,9 +38,9 @@
- name: Calico | Disable node mesh - name: Calico | Disable node mesh
shell: calicoctl bgp node-mesh off shell: calicoctl bgp node-mesh off
when: peer_with_router is defined and peer_with_router and inventory_hostname in groups['kube-node'] when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']
- name: Calico | Configure peering with router(s) - name: Calico | Configure peering with router(s)
shell: calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }} shell: calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}
with_items: peers with_items: peers
when: peer_with_router and inventory_hostname in groups['kube-node'] when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']

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

@ -8,7 +8,7 @@ User=root
PermissionsStartOnly=true PermissionsStartOnly=true
ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
{% if inventory_hostname in groups['kube-node'] %} {% if inventory_hostname in groups['kube-node'] %}
{% if peer_with_router %} {% if peer_with_router|default(false) %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes
{% else %} {% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes