浏览代码

Merge pull request #7825 from dcbw/sdn-leave-plugins-alone

sdn: don't blow away all existing CNI plugins
OpenShift Merge Robot 6 年之前
父节点
当前提交
947061af29
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      roles/openshift_sdn/files/sdn.yaml

+ 1 - 2
roles/openshift_sdn/files/sdn.yaml

@@ -78,8 +78,7 @@ spec:
           done
 
           # Take over network functions on the node
-          rm -Rf /etc/cni/net.d/*
-          rm -Rf /host/opt/cni/bin/*
+          rm -Rf /etc/cni/net.d/80-openshift-network.conf
           cp -Rf /opt/cni/bin/* /host/opt/cni/bin/
 
           if [[ -f /etc/sysconfig/origin-node ]]; then