Skip to content
Snippets Groups Projects

[cern] k8s: Clear cni configuration

Merged [cern] k8s: Clear cni configuration
os9473 into cern/stein
Merged Spyridon Trigazis requested to merge os9473 into cern/stein
Compare
and
2 files
+ 8
− 0
Compare changes
  • Side-by-side
  • Inline
Files
2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+ 4
− 0
@@ -18,7 +18,11 @@ fi
@@ -18,7 +18,11 @@ fi
_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
_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 /opt/cni
 
mkdir -p /etc/cni/net.d/
_addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]}'
_addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]}'
if [ "$NETWORK_DRIVER" = "calico" ]; then
if [ "$NETWORK_DRIVER" = "calico" ]; then