openstack/trove
Code Issues Proposed changes

Merge "trovestack doesn't understand the new systemd based system"

Browse Source
This commit is contained in:
Jenkins 2017-05-29 22:45:53 +00:00 committed by Gerrit Code Review
commit d5ecf2f0d9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
integration/scripts/trovestack
View File

@ -938,9 +938,11 @@ function init_fake_mode() {
} }
function cmd_start() { function cmd_start() {
TOP_DIR=$PATH_DEVSTACK_SRC
source ${TOP_DIR}/stackrc
if screen -ls | grep -q stack; then if screen -ls | grep -q stack; then
USE_SCREEN=True USE_SCREEN=True
TOP_DIR=$PATH_DEVSTACK_SRC
LOGDIR=$TROVE_LOGDIR LOGDIR=$TROVE_LOGDIR
RUNNING=$(screen -S stack -Q windows) RUNNING=$(screen -S stack -Q windows)
if [[ "$RUNNING" =~ " tr-" ]]; then if [[ "$RUNNING" =~ " tr-" ]]; then
@ -951,7 +953,9 @@ function cmd_start() {
start_trove start_trove
fi fi
else else
echo "WARNING: Could not start Trove services because there is no stack screen session running" source "$TROVE_DEVSTACK_SETTINGS"
source /dev/stdin < <(sed -n '/^function start_trove\(\)/,/^}/p' "$TROVE_DEVSTACK_PLUGIN")
start_trove
fi fi
} }
@ -977,6 +981,9 @@ function cmd_run_fake() {
############################################################################### ###############################################################################
function cmd_stop() { function cmd_stop() {
TOP_DIR=$PATH_DEVSTACK_SRC
source ${TOP_DIR}/stackrc
if screen -ls | grep -q stack; then if screen -ls | grep -q stack; then
rm -f $DEST/status/stack/tr-* rm -f $DEST/status/stack/tr-*
USE_SCREEN=True USE_SCREEN=True
@ -998,7 +1005,9 @@ function cmd_stop() {
fi fi
done done
else else
echo "WARNING: Could not stop Trove services because there is no stack screen session running" source "$TROVE_DEVSTACK_SETTINGS"
source /dev/stdin < <(sed -n '/^function stop_trove\(\)/,/^}/p' "$TROVE_DEVSTACK_PLUGIN")
stop_trove
fi fi
} }