Browse Source

default value for 'peer_with_router'

pull/13/head
Smaine Kahlouch 9 years ago
parent
commit
3fb9101e40
2 changed files with 3 additions and 3 deletions
  1. 4
      roles/network_plugin/tasks/calico.yml
  2. 2
      roles/network_plugin/templates/calico/calico-node.service.j2

4
roles/network_plugin/tasks/calico.yml

@ -38,9 +38,9 @@
- name: Calico | Disable node mesh
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)
shell: calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}
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

@ -8,7 +8,7 @@ User=root
PermissionsStartOnly=true
ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
{% 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
{% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes

Loading…
Cancel
Save