From 7a118dcce65a9e424b7b22e2e17420750229a0af Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Fri, 5 Jul 2019 16:42:48 +0200 Subject: [PATCH] [cern] k8s: Clear cni configuration cherry-picked from: https://review.opendev.org/#/c/669166/1 In fedora atomic 29, podman is present and configures its own cni. We need to clear the cni configuration otherwise we will get that cni0 is already used. story: 2006171 task: 35682 Change-Id: Ic70938184bdb98eaaf4f384ce553818cf2624a2a Signed-off-by: Spyros Trigazis --- .../kubernetes/fragments/configure-kubernetes-master.sh | 4 ++++ .../kubernetes/fragments/configure-kubernetes-minion.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index a83ddce2c..17c02a0ab 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -18,7 +18,11 @@ fi _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/} +rm -rf /etc/cni/net.d/* +rm -rf /var/lib/cni/* +rm -rf /opt/cni/* mkdir -p /opt/cni +mkdir -p /etc/cni/net.d/ _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]}' if [ "$NETWORK_DRIVER" = "calico" ]; then diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index ec4d21dad..e01876178 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -19,7 +19,11 @@ fi _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/} _addtl_mounts='' +rm -rf /etc/cni/net.d/* +rm -rf /var/lib/cni/* +rm -rf /opt/cni/* mkdir -p /opt/cni +mkdir -p /etc/cni/net.d/ _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]}' if [ "$NETWORK_DRIVER" = "calico" ]; then -- GitLab