cleanup sahara commands
this change will migrate the "sahara" process name to "sahara-all" to provide greater clarity on what service process is running. * change start process to sahara-all * change stop process to sahara-all * add a sahara-all detection to is_service_enabled * remove dirname usage in favor of GITDIR environment variable for the shutdown script Change-Id: I80b82edbc6023d4dc28f005fecd8f2138809bbe3
This commit is contained in:
parent
1231b1630b
commit
53fd84afb5
@ -175,7 +175,7 @@ function start_sahara {
|
|||||||
service_protocol="http"
|
service_protocol="http"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_process sahara "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"
|
run_process sahara-all "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"
|
||||||
run_process sahara-api "$SAHARA_BIN_DIR/sahara-api --config-file $SAHARA_CONF_FILE"
|
run_process sahara-api "$SAHARA_BIN_DIR/sahara-api --config-file $SAHARA_CONF_FILE"
|
||||||
run_process sahara-eng "$SAHARA_BIN_DIR/sahara-engine --config-file $SAHARA_CONF_FILE"
|
run_process sahara-eng "$SAHARA_BIN_DIR/sahara-engine --config-file $SAHARA_CONF_FILE"
|
||||||
|
|
||||||
@ -193,7 +193,7 @@ function start_sahara {
|
|||||||
# stop_sahara() - Stop running processes
|
# stop_sahara() - Stop running processes
|
||||||
function stop_sahara {
|
function stop_sahara {
|
||||||
# Kill the Sahara screen windows
|
# Kill the Sahara screen windows
|
||||||
stop_process sahara
|
stop_process sahara-all
|
||||||
stop_process sahara-api
|
stop_process sahara-api
|
||||||
stop_process sahara-eng
|
stop_process sahara-eng
|
||||||
}
|
}
|
||||||
@ -201,7 +201,7 @@ function stop_sahara {
|
|||||||
# is_sahara_enabled. This allows is_service_enabled sahara work
|
# is_sahara_enabled. This allows is_service_enabled sahara work
|
||||||
# correctly throughout devstack.
|
# correctly throughout devstack.
|
||||||
function is_sahara_enabled {
|
function is_sahara_enabled {
|
||||||
if is_service_enabled sahara-api || is_service_enabled sahara-eng; then
|
if is_service_enabled sahara-api || is_service_enabled sahara-eng || is_service_enabled sahara-all; then
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return 1
|
return 1
|
||||||
|
@ -12,7 +12,7 @@ source $BASE_DEVSTACK_DIR/functions
|
|||||||
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
|
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
|
||||||
|
|
||||||
source $BASE_DEVSTACK_DIR/lib/tls
|
source $BASE_DEVSTACK_DIR/lib/tls
|
||||||
source $(dirname $(dirname $BASH_SOURCE))/plugin.sh
|
source ${GITDIR[sahara]}/devstack/plugin.sh
|
||||||
|
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user