openstack/deb-sahara
Code Issues Proposed changes

Make infra engine configurable in devstack plugin

Browse Source 
Currently the infra engine conf value only depends on the
availability of the heat service, but sometimes (for testing) we'd
like to enforce one of the values.

Change-Id: I157a127448243dc01a4b26bdb84acceaea55a822
This commit is contained in:
Sergey Lukjanov 2015-08-17 00:33:52 +03:00
parent 7737f296bf
commit 5fbd0108d9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -109,7 +109,7 @@ function configure_sahara {
iniset $SAHARA_CONF_FILE DEFAULT use_neutron false iniset $SAHARA_CONF_FILE DEFAULT use_neutron false
fi fi
if is_service_enabled heat; then if [ "$SAHARA_INFRA_ENGINE" == "heat" ] && [ is_service_enabled heat ]; then
iniset $SAHARA_CONF_FILE DEFAULT infrastructure_engine heat iniset $SAHARA_CONF_FILE DEFAULT infrastructure_engine heat
if is_ssl_enabled_service "heat" || is_service_enabled tls-proxy; then if is_ssl_enabled_service "heat" || is_service_enabled tls-proxy; then

1
devstack/settings
View File

@ -24,6 +24,7 @@ SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
SAHARA_AUTH_CACHE_DIR=${SAHARA_AUTH_CACHE_DIR:-/var/cache/sahara} SAHARA_AUTH_CACHE_DIR=${SAHARA_AUTH_CACHE_DIR:-/var/cache/sahara}
SAHARA_ENABLED_PLUGINS=${SAHARA_ENABLED_PLUGINS:-vanilla,hdp,cdh,mapr,spark,storm,fake} SAHARA_ENABLED_PLUGINS=${SAHARA_ENABLED_PLUGINS:-vanilla,hdp,cdh,mapr,spark,storm,fake}
SAHARA_INFRA_ENGINE=${SAHARA_INFRA_ENGINE:-heat}
SAHARA_BIN_DIR=$(get_python_exec_prefix) SAHARA_BIN_DIR=$(get_python_exec_prefix)