Merge "Enable heat_enable_wait_condition by default"
This commit is contained in:
commit
cc0e7e9c70
@ -34,7 +34,7 @@ INSTANCE_RESOURCE_NAME = "inst"
|
|||||||
|
|
||||||
heat_engine_opts = [
|
heat_engine_opts = [
|
||||||
cfg.BoolOpt(
|
cfg.BoolOpt(
|
||||||
'heat_enable_wait_condition', default=False,
|
'heat_enable_wait_condition', default=True,
|
||||||
help="Enable wait condition feature to reduce polling during cluster "
|
help="Enable wait condition feature to reduce polling during cluster "
|
||||||
"creation")
|
"creation")
|
||||||
]
|
]
|
||||||
|
@ -32,3 +32,8 @@ echo "SAHARA_INFRA_ENGINE=$ENGINE" >> $LOCALRC_PATH
|
|||||||
# for example, to pass some config options directly to sahara.conf file
|
# 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 '[[post-config|$SAHARA_CONF]]\n[DEFAULT]\n' >> $LOCALCONF_PATH
|
||||||
# echo -e 'infrastructure_engine=true\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
|
||||||
|
Loading…
Reference in New Issue
Block a user