From 12d9f1cd0db023c31527f65b994a4e201a4540fe Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Mon, 5 Aug 2013 20:07:07 +0400
Subject: [PATCH] No need to merge heat templates with current one because we
 rebuild it on every deployment

Change-Id: I9a598aac6b6f3d53dae9d8b3d4870218b8babfe0
---
 data/workflows/AspNetApps.xml               | 4 ++--
 muranoconductor/commands/cloud_formation.py | 4 ++++
 tests/conductor/test_heat_commands.py       | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/workflows/AspNetApps.xml b/data/workflows/AspNetApps.xml
index 4311fca..ba65a50 100644
--- a/data/workflows/AspNetApps.xml
+++ b/data/workflows/AspNetApps.xml
@@ -43,7 +43,7 @@
 		</update-cf-stack>
 	</rule>
 
-	<rule match="$.services[?(@.type in ('webServerFarm', 'aspNetAppFarm'))].units[?(@.state.hostname and not @.state.registeredWithLB)]"
+	<rule match="$.services[?(@.type in ('webServerFarm', 'aspNetAppFarm'))].units[?(@.state.hostname and not @.temp.registeredWithLB)]"
           desc="Units of web-farms services which have a hostname assigned but are not registered with LB">
 		<update-cf-stack template="LoadBalancer" result="outputs">
 			<parameter name="mappings">
@@ -54,7 +54,7 @@
 				</map>
 			</parameter>
 			<success>
-				<set path="state.registeredWithLB"><true/></set>
+				<set path="temp.registeredWithLB"><true/></set>
 				<set path="::uri">http://<select source="outputs" path="LoadBalancerIP"/>:<select path="::loadBalancerPort"/></set>
 			</success>
 		</update-cf-stack>
diff --git a/muranoconductor/commands/cloud_formation.py b/muranoconductor/commands/cloud_formation.py
index 1adfb37..f6bcd4c 100644
--- a/muranoconductor/commands/cloud_formation.py
+++ b/muranoconductor/commands/cloud_formation.py
@@ -110,6 +110,10 @@ class HeatExecutor(CommandBase):
         template, arguments = self._get_current_template()
         stack_exists = (template != {})
 
+        # do not need to merge with current stack cause we rebuilding it from
+        # scratch on every deployment
+        template, arguments = ({}, {})
+
         for t in self._update_pending_list:
             template = muranoconductor.helpers.merge_dicts(
                 template, t['template'])
diff --git a/tests/conductor/test_heat_commands.py b/tests/conductor/test_heat_commands.py
index d41d0cf..e3c2fe3 100644
--- a/tests/conductor/test_heat_commands.py
+++ b/tests/conductor/test_heat_commands.py
@@ -136,7 +136,6 @@ class TestHeatExecutor(unittest.TestCase):
                 'arg1': 'arg1Value',
                 'arg2': 'arg2Value'},
             template={
-                'instance': {},
                 "testName": {
                     "testKey": "testValue"
                 }