From 94814b7425b50803030ef94b21695e9d4a4f25fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awek=20Kap=C5=82o=C5=84ski?= <skaplons@redhat.com>
Date: Tue, 20 Dec 2022 11:15:47 +0100
Subject: [PATCH] Remove lib/neutron-legacy leftovers

In [1] we finally got rid of the unfinished lib/neutron module and kept
only lib/neutron-legacy. It's renamed to lib/neutron now and it's the
only neutron related module in Devstack.
So this patch removes leftovers related to the old lib/neutron-legacy.

[1] https://review.opendev.org/c/openstack/devstack/+/865014

Change-Id: I2a856b15eda992f0e78ee8eff65f39646e24c936
---
 functions                       | 2 +-
 projects/50_neutron/shutdown.sh | 1 -
 projects/50_neutron/upgrade.sh  | 3 +--
 upgrade-tempest                 | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/functions b/functions
index 3efb6b0e..0550a094 100644
--- a/functions
+++ b/functions
@@ -45,7 +45,7 @@ function source_quiet {
 }
 
 # TODO: we'd really like to use the ping_check_functions that exist in
-# devstack, however they are all wrapped up in lib/neutron-legacy
+# devstack, however they are all wrapped up in lib/neutron
 # gorp. Until that can be cleanly separated we need to keep our own
 # copy here.
 #
diff --git a/projects/50_neutron/shutdown.sh b/projects/50_neutron/shutdown.sh
index 8e9c9607..705c6496 100755
--- a/projects/50_neutron/shutdown.sh
+++ b/projects/50_neutron/shutdown.sh
@@ -13,7 +13,6 @@ source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 source $BASE_DEVSTACK_DIR/lib/apache
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/neutron
-source $BASE_DEVSTACK_DIR/lib/neutron-legacy
 
 set -o xtrace
 
diff --git a/projects/50_neutron/upgrade.sh b/projects/50_neutron/upgrade.sh
index c93bda86..675b80c3 100755
--- a/projects/50_neutron/upgrade.sh
+++ b/projects/50_neutron/upgrade.sh
@@ -86,8 +86,7 @@ TOP_DIR=$TARGET_DEVSTACK_DIR
 source $TARGET_DEVSTACK_DIR/lib/apache
 source $TARGET_DEVSTACK_DIR/lib/tls
 source $TARGET_DEVSTACK_DIR/lib/keystone
-[[ -r $TARGET_DEVSTACK_DIR/lib/neutron ]] && source $TARGET_DEVSTACK_DIR/lib/neutron
-source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
+source $TARGET_DEVSTACK_DIR/lib/neutron
 source $TARGET_DEVSTACK_DIR/lib/database
 source $TARGET_DEVSTACK_DIR/lib/nova
 
diff --git a/upgrade-tempest b/upgrade-tempest
index a6a1eb0e..52664520 100755
--- a/upgrade-tempest
+++ b/upgrade-tempest
@@ -52,7 +52,7 @@ source $TARGET_DEVSTACK_DIR/lib/cinder
 source $TARGET_DEVSTACK_DIR/lib/glance
 source $TARGET_DEVSTACK_DIR/lib/horizon
 source $TARGET_DEVSTACK_DIR/lib/keystone
-source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
+source $TARGET_DEVSTACK_DIR/lib/neutron
 source $TARGET_DEVSTACK_DIR/lib/nova
 source $TARGET_DEVSTACK_DIR/lib/swift