move task network-environment

9 years ago · 70aa68b9c7
2 changed files with 5 additions and 7 deletions
--- 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

--- 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
-