diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-04 23:52:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-04 23:52:35 +0000 |
| commit | 06b7841b06f38a2490a8793b31d67fffc815fd5a (patch) | |
| tree | bb9bbe5a375f30ecf921b6dd43a4f28b3bb665a9 /devstack/upgrade | |
| parent | d84db90b802fa16e5e1dc8ecec7907ebac096e32 (diff) | |
| parent | f2b4c983d380680d6148311ee764eaa26dd906c5 (diff) | |
| download | heat-06b7841b06f38a2490a8793b31d67fffc815fd5a.tar.gz | |
Merge "Remove cloudwatch service from devstack plugin"
Diffstat (limited to 'devstack/upgrade')
| -rw-r--r-- | devstack/upgrade/settings | 4 | ||||
| -rwxr-xr-x | devstack/upgrade/shutdown.sh | 6 | ||||
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 23f946e54..ac0091e60 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,6 +1,6 @@ register_project_for_upgrade heat register_db_to_save heat -devstack_localrc base enable_service h-api h-api-cfn h-api-cw h-eng heat tempest -devstack_localrc target enable_service h-api h-api-cfn h-api-cw h-eng heat tempest +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 diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh index 2e429a3f5..dfe566cee 100755 --- a/devstack/upgrade/shutdown.sh +++ b/devstack/upgrade/shutdown.sh @@ -30,7 +30,11 @@ set -o xtrace stop_heat -SERVICES_DOWN="heat-api heat-engine heat-api-cfn heat-api-cloudwatch" +# stop cloudwatch service if running +# TODO(ramishra): Remove it after Queens +stop_cw_service + +SERVICES_DOWN="heat-api heat-engine heat-api-cfn" # sanity check that services are actually down ensure_services_stopped $SERVICES_DOWN diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 905d48a5f..115e57684 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -86,7 +86,7 @@ start_heat # Don't succeed unless the services come up # Truncating some service names to 11 characters -ensure_services_started heat-api heat-engine heat-api-cl heat-api-cf +ensure_services_started heat-api heat-engine heat-api-cf set +o xtrace echo "*********************************************************************" |