From 33794a862721b2a97ff57b8907787fa7fc2c02ee Mon Sep 17 00:00:00 2001
From: Vitaly Gridnev <vgridnev@mirantis.com>
Date: Tue, 24 Nov 2015 13:25:49 +0300
Subject: [PATCH] Enable heat_enable_wait_condition by default

Set heat_enable_wait_condition to True by the default. Also
disable that in gate-sahara-dsvm-scenario-nova-heat job.

Related-bug: 1516784

Change-Id: If2e8a4ad010d516f65e2f9ae4449d70cc30d8e44
---
 sahara/service/heat/templates.py     | 2 +-
 tools/gate/scenario/pre_test_hook.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sahara/service/heat/templates.py b/sahara/service/heat/templates.py
index fe69f2e983..e339308f99 100644
--- a/sahara/service/heat/templates.py
+++ b/sahara/service/heat/templates.py
@@ -33,7 +33,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")
 ]
diff --git a/tools/gate/scenario/pre_test_hook.sh b/tools/gate/scenario/pre_test_hook.sh
index ce83a495bb..c4c4143d18 100755
--- a/tools/gate/scenario/pre_test_hook.sh
+++ b/tools/gate/scenario/pre_test_hook.sh
@@ -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