From 83c1105192082605d0394c5945402e2813805224 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Fri, 11 Dec 2015 11:42:25 +0100
Subject: [PATCH] Configuring calico pool once, before starting calico-node
---
roles/network_plugin/tasks/calico.yml | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml
index c461f5607..818dab709 100644
--- a/roles/network_plugin/tasks/calico.yml
+++ b/roles/network_plugin/tasks/calico.yml
@@ -9,6 +9,12 @@
- name: Calico | Create calicoctl symlink (needed by kubelet)
file: src=/usr/local/bin/calicoctl dest=/usr/bin/calicoctl state=link
+- name: Calico | Configure calico-node desired pool
+ shell: calicoctl pool add {{ kube_pods_subnet }}
+ environment:
+ ETCD_AUTHORITY: "{{ groups['kube-master'][0] }}:2379"
+ run_once: true
+
- name: Calico | Write calico-node systemd init file
template: src=calico/calico-node.service.j2 dest=/etc/systemd/system/calico-node.service
register: newservice
@@ -24,18 +30,6 @@
- name: Calico | Enable calico-node
service: name=calico-node enabled=yes state=started
-- name: Calico | Configure calico-node desired pool
- shell: calicoctl pool add {{ kube_pods_subnet }}
- environment:
- ETCD_AUTHORITY: "{{ groups['kube-master'][0] }}:4001"
- run_once: true
-
-- name: Calico | Configure calico-node remove default pool
- shell: calicoctl pool remove 192.168.0.0/16
- environment:
- ETCD_AUTHORITY: "{{ groups['kube-master'][0] }}:4001"
- run_once: true
-
- name: Calico | Disable node mesh
shell: calicoctl bgp node-mesh off
when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']
--
GitLab