diff options
| author | Sławek Kapłoński <skaplons@redhat.com> | 2022-12-20 11:18:25 +0100 |
|---|---|---|
| committer | Sławek Kapłoński <skaplons@redhat.com> | 2022-12-20 11:18:25 +0100 |
| commit | facd1bca661485ebd764f45b92a0a35dfd4085e8 (patch) | |
| tree | b6f2d8a58d23b7eace01c9b923e9ea639ee1b20c | |
| parent | ef772c2c1e84769a982c54ec8832e2a06b8f1911 (diff) | |
| download | ironic-facd1bca661485ebd764f45b92a0a35dfd4085e8.tar.gz | |
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: Id938deab7188743e754d028dee8e0b2591ab6f7b
| -rw-r--r-- | devstack/lib/ironic | 2 | ||||
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index aae8ca5cf..aaf4db482 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -586,7 +586,7 @@ TEMPEST_BAREMETAL_MIN_MICROVERSION=${TEMPEST_BAREMETAL_MIN_MICROVERSION:-} TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-} # TODO(TheJulia): This PHYSICAL_NETWORK needs to be refactored in -# our devstack plugin. It is used by the neutron-legacy integration, +# our devstack plugin. It is used by the neutron integration, # however they want to name the new variable for the current neutron # plugin NEUTRON_PHYSICAL_NETWORK. For now we'll do some magic and # change it later once we migrate our jobs. diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 7801ccd26..a3d51696a 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -40,7 +40,7 @@ set -o errexit source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/nova -source $TARGET_DEVSTACK_DIR/lib/neutron-legacy +source $TARGET_DEVSTACK_DIR/lib/neutron source $TARGET_DEVSTACK_DIR/lib/apache source $TARGET_DEVSTACK_DIR/lib/keystone |