openstack
/
sahara
Code Issues Proposed changes

Merge "grenade: relevant fixes for master (sahara-api/apache)"

This commit is contained in:
Zuul 2018-09-20 15:57:20 +00:00 committed by Gerrit Code Review
parent 10e48a379f 45714289e7
commit e54cfaa7dc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/upgrade/shutdown.sh
View File

@ -12,6 +12,7 @@ set -o errexit
. $BASE_DEVSTACK_DIR/stackrc # needed for status directory
. $BASE_DEVSTACK_DIR/lib/tls
. $BASE_DEVSTACK_DIR/lib/apache
. ${GITDIR[sahara]}/devstack/plugin.sh
set -o xtrace
@ -20,4 +21,4 @@ export ENABLED_SERVICES+=,sahara-api,sahara-eng,
stop_sahara
# sanity check that service is actually down
ensure_services_stopped sahara-api sahara-eng
ensure_services_stopped sahara-eng

2
devstack/upgrade/upgrade.sh
View File

@ -65,7 +65,7 @@ $SAHARA_BIN_DIR/sahara-db-manage --config-file $SAHARA_CONF_FILE \
start_sahara
# Don't succeed unless the service come up
ensure_services_started sahara
ensure_services_started sahara-eng
set +o xtrace
echo "*********************************************************************"