summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorKien Nguyen <kiennt@vn.fujitsu.com>2017-10-09 10:46:39 +0700
committerKien Nguyen <kiennt@vn.fujitsu.com>2018-02-23 16:17:18 +0700
commit2efa4c7e82ba766b7ea8955ba8885121ab739a76 (patch)
treeb57bc37e7d84ede9d2a8ea5beb85db35410b6284 /devstack
parent9ed49447b67642a821a326889c54b0ab11df65fa (diff)
downloadheat-2efa4c7e82ba766b7ea8955ba8885121ab739a76.tar.gz
Change transport_url in grenade-multinode job
* Change transport_url to test Heat's upgrade strategy [1] in gate. [1] https://review.openstack.org/475853/ Change-Id: I08770d2ae09891d7983345616186cff7c26df4ce
Diffstat (limited to 'devstack')
-rw-r--r--devstack/upgrade/settings2
-rwxr-xr-xdevstack/upgrade/upgrade.sh8
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