diff options
Diffstat (limited to 'devstack')
-rw-r--r-- | devstack/upgrade/settings | 2 | ||||
-rwxr-xr-x | devstack/upgrade/upgrade.sh | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index ac0091e60..2b774b757 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -4,3 +4,5 @@ devstack_localrc base enable_service h-api h-api-cfn h-eng heat tempest devstack_localrc target enable_service h-api h-api-cfn h-eng heat tempest BASE_RUN_SMOKE=False TARGET_RUN_SMOKE=False + +export HOST_TOPOLOGY=${HOST_TOPOLOGY} diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index d7fb2e729..f73639fec 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -58,6 +58,7 @@ source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/stack source $TARGET_DEVSTACK_DIR/lib/apache +source $TARGET_DEVSTACK_DIR/lib/rpc_backend # Get heat functions from devstack plugin source $HEAT_DEVSTACK_DIR/lib/heat @@ -72,6 +73,13 @@ set -o xtrace # Install the target heat source $HEAT_DEVSTACK_DIR/plugin.sh stack install +# Change transport-url in the host which runs upgrade script (primary) +if [[ "${HOST_TOPOLOGY}" == "multinode" ]]; then + vhost="newvhost" + rpc_backend_add_vhost $vhost + iniset_rpc_backend heat $HEAT_CONF DEFAULT $vhost +fi + # calls upgrade-heat for specific release upgrade_project heat $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH |