From 595e93e6da63482e82ce1bde941ee3b3e9005c71 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Thu, 24 Dec 2015 13:56:53 +0100
Subject: [PATCH] Peer with router configuration is made on the first etcd node
---
roles/network_plugin/tasks/calico.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml
index 1d455ef8f..2cf3e2b2c 100644
--- a/roles/network_plugin/tasks/calico.yml
+++ b/roles/network_plugin/tasks/calico.yml
@@ -23,8 +23,6 @@
- name: Calico | Configure calico network pool
shell: calicoctl pool add {{ kube_pods_subnet }}
- environment:
- ETCD_AUTHORITY: "{{ groups['etcd'][0] }}:2379"
run_once: true
when: calico_conf.status == 404
delegate_to: "{{ groups['etcd'][0] }}"
@@ -63,9 +61,13 @@
- name: Calico | Disable node mesh
shell: calicoctl bgp node-mesh off
+ environment:
+ ETCD_AUTHORITY: "{{ groups['etcd'][0] }}:2379"
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 }}
+ environment:
+ ETCD_AUTHORITY: "{{ groups['etcd'][0] }}:2379"
with_items: peers
when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']
--
GitLab