openstack/trove
Code Issues Proposed changes

trovestack doesn't understand the new systemd based system

Browse Source 
trovestack is tied to a screen based deployment. This change addresses
this shortcoming by invoking cmd_start and cmd_stop even if screen
isn't found.

Depends-On: I2f2a12207581a94fb8561a6d65a3a79b4a29b063

Change-Id: Id3d95ea97ad4ef9d3acd1e28c980af80d0903203
Closes-Bug: #1688626
This commit is contained in:
Amrith Kumar 2017-05-08 15:33:20 -04:00 committed by Amrith Kumar
parent e58067f59e
commit 89e219f56e
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() {
TOP_DIR=$PATH_DEVSTACK_SRC
source ${TOP_DIR}/stackrc
if screen -ls | grep -q stack; then
USE_SCREEN=True
TOP_DIR=$PATH_DEVSTACK_SRC
LOGDIR=$TROVE_LOGDIR
RUNNING=$(screen -S stack -Q windows)
if [[ "$RUNNING" =~ " tr-" ]]; then
@ -951,7 +953,9 @@ function cmd_start() {
start_trove
fi
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
}
@ -977,6 +981,9 @@ function cmd_run_fake() {
###############################################################################
function cmd_stop() {
TOP_DIR=$PATH_DEVSTACK_SRC
source ${TOP_DIR}/stackrc
if screen -ls | grep -q stack; then
rm -f $DEST/status/stack/tr-*
USE_SCREEN=True
@ -998,7 +1005,9 @@ function cmd_stop() {
fi
done
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
}