Reset tasks specific to a network_plugin moved inside its role directory + Reset tasks specific to cilium

pull/3105/head
Erwan Miran 2018-08-16 17:34:33 +02:00
parent 58ee5f1cc9
commit 7f16b46ed5
4 changed files with 40 additions and 26 deletions

View File

@ -0,0 +1,9 @@
---
- name: reset | check and remove devices if still present
include_tasks: reset_iface.yml
vars:
iface: "{{ item }}"
with_items:
- cilium_host
- cilium_net
- cilium_vxlan

View File

@ -0,0 +1,9 @@
---
- name: "reset | check if network device {{ iface }} is present"
stat:
path: "/sys/class/net/{{ iface }}"
register: device_remains
- name: "reset | remove network device {{ iface }}"
command: "ip link del {{ iface }}"
when: device_remains.stat.exists

View File

@ -0,0 +1,18 @@
---
- name: reset | check cni network device
stat:
path: /sys/class/net/cni0
register: cni
- name: reset | remove the network device created by the flannel
command: ip link del cni0
when: cni.stat.exists
- name: reset | check flannel network device
stat:
path: /sys/class/net/flannel.1
register: flannel
- name: reset | remove the network device created by the flannel
command: ip link del flannel.1
when: flannel.stat.exists

View File

@ -167,33 +167,11 @@
- files
- dns
- name: reset | check cni network device
stat:
path: /sys/class/net/cni0
register: cni
when: kube_network_plugin == 'flannel'
- name: reset | include file with reset tasks specific to the network_plugin if exists
include_tasks: "{{ (role_path + '/../network_plugin/' + kube_network_plugin + '/tasks/reset.yml') | realpath }}"
when: kube_network_plugin in ['flannel', 'cilium']
tags:
- flannel
- name: reset | remove the network device created by the flannel
command: ip link del cni0
when: kube_network_plugin == 'flannel' and cni.stat.exists
tags:
- flannel
- name: reset | check flannel network device
stat:
path: /sys/class/net/flannel.1
register: flannel
when: kube_network_plugin == 'flannel'
tags:
- flannel
- name: reset | remove the network device created by the flannel
command: ip link del flannel.1
when: kube_network_plugin == 'flannel' and flannel.stat.exists
tags:
- flannel
- network
- name: reset | Restart network
service: