summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-09-20 09:55:10 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-09-20 09:55:20 +0200
commit209c2fa22d82474edccba397ea034074181fa470 (patch)
tree3a9e9fa772689b85cba7cc6bbe3809112be3860b
parent7a596e020c6d6d1085dbc9d1fd7a0b14e19afec0 (diff)
downloadopenshift-209c2fa22d82474edccba397ea034074181fa470.tar.gz
openshift-209c2fa22d82474edccba397ea034074181fa470.tar.bz2
openshift-209c2fa22d82474edccba397ea034074181fa470.tar.xz
openshift-209c2fa22d82474edccba397ea034074181fa470.zip
crio: ensure no default CNI configuration files are left
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 0bab0899c..8208fa68d 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -134,6 +134,14 @@
image: "{{ l_crio_image }}"
state: latest
+- name: Remove CRI-o default configuration files
+ file:
+ path: "{{ item }}"
+ state: absent
+ with_items:
+ - /etc/cni/net.d/200-loopback.conf
+ - /etc/cni/net.d/100-crio-bridge.conf
+
- name: Create the CRI-O configuration
template:
dest: /etc/crio/crio.conf