openstack/grenade
Code Issues Proposed changes

Remove lib/neutron-legacy leftovers

Browse Source 
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
This commit is contained in:
Sławek Kapłoński 2022-12-20 11:15:47 +01:00
parent 0dd1e186b5
commit 94814b7425
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@ -45,7 +45,7 @@ function source_quiet {
} }
# TODO: we'd really like to use the ping_check_functions that exist in # 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 # gorp. Until that can be cleanly separated we need to keep our own
# copy here. # copy here.
# #

1
projects/50_neutron/shutdown.sh
View File

@ -13,7 +13,6 @@ source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/apache source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/neutron source $BASE_DEVSTACK_DIR/lib/neutron
source $BASE_DEVSTACK_DIR/lib/neutron-legacy
set -o xtrace set -o xtrace

3
projects/50_neutron/upgrade.sh
View File

@ -86,8 +86,7 @@ TOP_DIR=$TARGET_DEVSTACK_DIR
source $TARGET_DEVSTACK_DIR/lib/apache source $TARGET_DEVSTACK_DIR/lib/apache
source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/tls
source $TARGET_DEVSTACK_DIR/lib/keystone source $TARGET_DEVSTACK_DIR/lib/keystone
[[ -r $TARGET_DEVSTACK_DIR/lib/neutron ]] && source $TARGET_DEVSTACK_DIR/lib/neutron source $TARGET_DEVSTACK_DIR/lib/neutron
source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
source $TARGET_DEVSTACK_DIR/lib/database source $TARGET_DEVSTACK_DIR/lib/database
source $TARGET_DEVSTACK_DIR/lib/nova source $TARGET_DEVSTACK_DIR/lib/nova

2
upgrade-tempest
View File

@ -52,7 +52,7 @@ source $TARGET_DEVSTACK_DIR/lib/cinder
source $TARGET_DEVSTACK_DIR/lib/glance source $TARGET_DEVSTACK_DIR/lib/glance
source $TARGET_DEVSTACK_DIR/lib/horizon source $TARGET_DEVSTACK_DIR/lib/horizon
source $TARGET_DEVSTACK_DIR/lib/keystone 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/nova
source $TARGET_DEVSTACK_DIR/lib/swift source $TARGET_DEVSTACK_DIR/lib/swift