From 00d7a83efd3a89ba37791c6b78f78fafb22e17e6 Mon Sep 17 00:00:00 2001
From: Adit Sarfaty <asarfaty@vmware.com>
Date: Thu, 31 Jan 2019 10:08:52 +0200
Subject: [PATCH] Devstack: Delete old project before deciding how to get the
 new code

Change-Id: I7e34931dc7155a36475328d3e45d2759e2f36baf
---
 devstack/lib/nsx_common | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/devstack/lib/nsx_common b/devstack/lib/nsx_common
index a19a78bff0..2fcdfb5422 100644
--- a/devstack/lib/nsx_common
+++ b/devstack/lib/nsx_common
@@ -34,26 +34,26 @@ function install_neutron_projects {
     pkg_list="networking-l2gw networking-sfc neutron-lbaas neutron-fwaas neutron-dynamic-routing neutron-vpnaas octavia vmware-nsxlib"
     for pkg in `echo $pkg_list`
     do
+        pkg_renamed=`echo $pkg | sed 's/-/_/g'`
+        sudo rm -rf /usr/local/lib/python2.7/dist-packages/${pkg_renamed}*
+        sudo rm -rf /usr/local/lib/python3.5/dist-packages/${pkg_renamed}*
+        sudo rm -rf ./src/${pkg_renamed}*
         if is_plugin_enabled $pkg; then
             echo "Plugin $pkg enabled explicitly with enable_plugin"
         elif use_library_from_git $pkg; then
             echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
         else
-            pkg_renamed=`echo $pkg | sed 's/-/_/g'`
-            sudo rm -rf /usr/local/lib/python2.7/dist-packages/${pkg_renamed}*
-            sudo rm -rf /usr/local/lib/python3.5/dist-packages/${pkg_renamed}*
-            sudo rm -rf ./src/${pkg_renamed}*
             sudo pip install -e "git+https://git.openstack.org/openstack/${pkg}#egg=${pkg_renamed}"
             sudo chown -R ${USER}:${USER} src/${pkg}
         fi
     done
+    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
+    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
+    sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron
+    sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron.egg*
     if is_service_enabled neutron; then
        echo "service Neutron is enabled explicitly by devstack"
     else
-        sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
-        sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
-        sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron
-        sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron.egg*
         sudo pip install -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
         sudo chown -R ${USER}:${USER} src/neutron
     fi