k8s: Clear cni configuration
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 <spyridon.trigazis@cern.ch>
(cherry picked from commit afd2403adc
)
This commit is contained in:
parent
411b406297
commit
3b2b764917
|
@ -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"]},{"type":"bind","source":"/var/lib/docker","destination":"/var/lib/docker","options":["bind","rw","slave","mode=755"]}'
|
||||
|
||||
if [ "$NETWORK_DRIVER" = "calico" ]; then
|
||||
|
|
|
@ -18,8 +18,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"]},{"type":"bind","source":"/var/lib/docker","destination":"/var/lib/docker","options":["bind","rw","slave","mode=755"]}'
|
||||
|
||||
if [ "$NETWORK_DRIVER" = "calico" ]; then
|
||||
|
|
Loading…
Reference in New Issue