Merge "Remove lib/neutron-legacy leftovers"

This commit is contained in:
Zuul 2023-01-04 17:29:49 +00:00 committed by Gerrit Code Review
commit c7a6dff51d
4 changed files with 3 additions and 5 deletions

View File

@ -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.
#

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/tls
source $BASE_DEVSTACK_DIR/lib/neutron
source $BASE_DEVSTACK_DIR/lib/neutron-legacy
set -o xtrace

View File

@ -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

View File

@ -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