From 70aa68b9c714ce24b2d69a82e358089233f10d96 Mon Sep 17 00:00:00 2001 From: Smaine Kahlouch Date: Mon, 16 Nov 2015 22:20:41 +0100 Subject: [PATCH] move task network-environment --- roles/network_plugin/tasks/calico.yml | 6 ------ roles/network_plugin/tasks/main.yml | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml index aefc3c80f..f7042bf50 100644 --- a/roles/network_plugin/tasks/calico.yml +++ b/roles/network_plugin/tasks/calico.yml @@ -15,12 +15,6 @@ - reload systemd - restart calico-node -- name: Calico | Write network-environment - template: src=calico/network-environment.j2 dest=/etc/network-environment mode=u+x - notify: - - reload systemd - - restart calico-node - - name: Calico | Enable calico-node service: name=calico-node enabled=yes state=started diff --git a/roles/network_plugin/tasks/main.yml b/roles/network_plugin/tasks/main.yml index e64e58f12..4b6c8c66a 100644 --- a/roles/network_plugin/tasks/main.yml +++ b/roles/network_plugin/tasks/main.yml @@ -6,8 +6,12 @@ - include: flannel.yml when: kube_network_plugin == "flannel" + +- name: Calico | Write network-environment + template: src=calico/network-environment.j2 dest=/etc/network-environment mode=u+x + when: kube_network_plugin == "calico" + - include: calico.yml when: kube_network_plugin == "calico" - meta: flush_handlers -