Configure network-environment with a single template

This commit is contained in:
Smaine Kahlouch
2015-12-11 11:44:41 +01:00
parent 83c1105192
commit b66cc67b6f
4 changed files with 26 additions and 28 deletions

View File

@@ -44,10 +44,6 @@
run_once: true
delegate_to: "{{ groups['kube-master'][0] }}"
- name: Write network-environment
template: src=flannel/network-environment.j2 dest=/etc/network-environment mode=u+x
notify: restart flannel
- name: Launch Flannel
service: name=flannel state=started enabled=yes
notify:

View File

@@ -4,13 +4,12 @@
when: ( kube_network_plugin is defined and kube_network_plugin == "calico" and kube_network_plugin == "flannel" ) or
kube_network_plugin is not defined
- name: Write network-environment
template: src=network-environment.j2 dest=/etc/network-environment mode=u+x
- 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"