openstack/devstack
Code Issues Proposed changes

Add support for enabling heat adopt and abandon

Browse Source 
This is by default disabled, but we need to enable
it to test it in the gate.

Change-Id: I2339ebcaf4bd6308041675bcd35c0b70206e2e5e
This commit is contained in:
Angus Salkeld 2015-01-07 17:52:05 +10:00
parent a6613851ab
commit 826e450936
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
@ -152,6 +153,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