openstack
/
sahara
Code Issues Proposed changes

Merge "Enable heat_enable_wait_condition by default"

This commit is contained in:
Jenkins 2015-11-26 12:12:35 +00:00 committed by Gerrit Code Review
parent b194572aa5 33794a8627
commit cc0e7e9c70
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/service/heat/templates.py
View File

@ -34,7 +34,7 @@ INSTANCE_RESOURCE_NAME = "inst"
heat_engine_opts = [
cfg.BoolOpt(
'heat_enable_wait_condition', default=False,
'heat_enable_wait_condition', default=True,
help="Enable wait condition feature to reduce polling during cluster "
"creation")
]

5
tools/gate/scenario/pre_test_hook.sh
View File

@ -32,3 +32,8 @@ echo "SAHARA_INFRA_ENGINE=$ENGINE" >> $LOCALRC_PATH
# for example, to pass some config options directly to sahara.conf file
# echo -e '[[post-config|$SAHARA_CONF]]\n[DEFAULT]\n' >> $LOCALCONF_PATH
# echo -e 'infrastructure_engine=true\n' >> $LOCALCONF_PATH
if [ "$NETWORK" == "nova-network" ]; then
echo -e '[[post-config|$SAHARA_CONF_FILE]]\n[DEFAULT]\n' >> $LOCALCONF_PATH
echo -e 'heat_enable_wait_condition=false\n' >> $LOCALCONF_PATH
fi