openstack/devstack
Code Issues Proposed changes

Merge "Add support for enabling heat adopt and abandon"

Browse Source
This commit is contained in:
Jenkins 2015-01-12 13:56:16 +00:00 committed by Gerrit Code Review
commit 992fbe3c59
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/heat
View File

@ -38,6 +38,7 @@ HEAT_CFNTOOLS_DIR=$DEST/heat-cfntools
HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates
HEAT_AUTH_CACHE_DIR=${HEAT_AUTH_CACHE_DIR:-/var/cache/heat} HEAT_AUTH_CACHE_DIR=${HEAT_AUTH_CACHE_DIR:-/var/cache/heat}
HEAT_STANDALONE=`trueorfalse False $HEAT_STANDALONE` HEAT_STANDALONE=`trueorfalse False $HEAT_STANDALONE`
HEAT_ENABLE_ADOPT_ABANDON=`trueorfalse False $HEAT_ENABLE_ADOPT_ABANDON`
HEAT_CONF_DIR=/etc/heat HEAT_CONF_DIR=/etc/heat
HEAT_CONF=$HEAT_CONF_DIR/heat.conf HEAT_CONF=$HEAT_CONF_DIR/heat.conf
HEAT_ENV_DIR=$HEAT_CONF_DIR/environment.d HEAT_ENV_DIR=$HEAT_CONF_DIR/environment.d
@ -151,6 +152,11 @@ function configure_heat {
iniset $HEAT_CONF clients_cinder ca_file $SSL_BUNDLE_FILE iniset $HEAT_CONF clients_cinder ca_file $SSL_BUNDLE_FILE
fi fi
if [[ "$HEAT_ENABLE_ADOPT_ABANDON" = "True" ]]; then
iniset $HEAT_CONF DEFAULT enable_stack_adopt true
iniset $HEAT_CONF DEFAULT enable_stack_abandon true
fi
# heat environment # heat environment
sudo mkdir -p $HEAT_ENV_DIR sudo mkdir -p $HEAT_ENV_DIR
sudo chown $STACK_USER $HEAT_ENV_DIR sudo chown $STACK_USER $HEAT_ENV_DIR