From 0bafb2a14e4e22f93d9e1f25f5b26701f9c4c983 Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Tue, 16 Jul 2013 23:46:06 +0400 Subject: [PATCH] Only one VM was registered in load balancer for farm-services Change-Id: I10e7dcc1ec0fe0c09b3eac160ec6273cf9e5fb7f --- conductor/commands/cloud_formation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conductor/commands/cloud_formation.py b/conductor/commands/cloud_formation.py index 9a6d3d6..23cddab 100644 --- a/conductor/commands/cloud_formation.py +++ b/conductor/commands/cloud_formation.py @@ -101,7 +101,7 @@ class HeatExecutor(CommandBase): for t in self._update_pending_list: template = conductor.helpers.merge_dicts( - template, t['template'], max_levels=2) + template, t['template']) arguments = conductor.helpers.merge_dicts( arguments, t['arguments'], max_levels=1)