diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-05 12:25:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-05 12:25:48 +0000 |
| commit | bed680951a55d2a0782c1e9abda6cd954045a577 (patch) | |
| tree | b1e17f1c480c53c99b6666a8a2df465aaf14751f | |
| parent | 4f6a456334c5ef291b7d2d47d2d62e273486ce89 (diff) | |
| parent | facd1bca661485ebd764f45b92a0a35dfd4085e8 (diff) | |
| download | ironic-bed680951a55d2a0782c1e9abda6cd954045a577.tar.gz | |
Merge "Remove lib/neutron-legacy leftovers"
| -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 ff17d3b65..25cca0f7f 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 |