From 1aef1bf6a5b7d2517f396f06fa776a08d9489bfa Mon Sep 17 00:00:00 2001 From: Lingxian Kong Date: Tue, 26 Sep 2017 22:06:57 +1300 Subject: [PATCH] Do not remove /run/openvswitch folder Neutron is using that folder for openvswitch stuff in devstack. Change-Id: I711e51311687161efe2f49d3d28010791be24f29 --- tools/gate/funcs/kube.sh | 1 - tools/kubeadm-aio/kubeadm-aio-launcher.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/gate/funcs/kube.sh b/tools/gate/funcs/kube.sh index 44397cf5..7e8db152 100755 --- a/tools/gate/funcs/kube.sh +++ b/tools/gate/funcs/kube.sh @@ -136,7 +136,6 @@ function kubeadm_aio_clean { /var/lib/etcd \ /var/etcd \ /var/lib/kubelet/* \ - /run/openvswitch \ /var/lib/nova \ ${HOME}/.kubeadm-aio/admin.conf \ /var/lib/openstack-helm \ diff --git a/tools/kubeadm-aio/kubeadm-aio-launcher.sh b/tools/kubeadm-aio/kubeadm-aio-launcher.sh index 4ad4e994..6b1d1c9a 100755 --- a/tools/kubeadm-aio/kubeadm-aio-launcher.sh +++ b/tools/kubeadm-aio/kubeadm-aio-launcher.sh @@ -30,7 +30,6 @@ sudo rm -rfv \ /var/lib/etcd \ /var/etcd \ /var/lib/kubelet/* \ - /run/openvswitch \ ${HOME}/.kubeadm-aio/admin.conf \ /var/lib/nfs-provisioner || true