openstack/deb-sahara
Code Issues Proposed changes

implement is_sahara_enabled

Browse Source 
The is_service_enabled method in devstack requires is_sahara_enabled
to be defined somewhere to be used in additional selectors like for
tempest configuration and possibly upgrade work later.

While trying to build a composit job that ran trove / heat / sahara
tests all together this was found to be missing, so sahara never got
configured for tempest.

Change-Id: I69acf6ab2d74d02e9fe8e2d419e54c9367fca500
This commit is contained in:
Sean Dague 2015-11-18 06:33:06 -05:00
parent 6b7e82863d
commit 1231b1630b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/plugin.sh
View File

@ -198,8 +198,18 @@ function stop_sahara {
stop_process sahara-eng
}
# is_sahara_enabled. This allows is_service_enabled sahara work
# correctly throughout devstack.
function is_sahara_enabled {
if is_service_enabled sahara-api || is_service_enabled sahara-eng; then
return 0
else
return 1
fi
}
# Dispatcher for Sahara plugin
if is_service_enabled sahara || is_service_enabled sahara-api || is_service_enabled sahara-eng; then
if is_service_enabled sahara; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing sahara"
install_sahara