stackforge-attic/murano-conductor
Code Issues Proposed changes

Only one VM was registered in load balancer for farm-services

Browse Source 
Change-Id: I10e7dcc1ec0fe0c09b3eac160ec6273cf9e5fb7f
This commit is contained in:
Stan Lagun 2013-07-16 23:46:06 +04:00
parent d77660f8dc
commit 0bafb2a14e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conductor/commands/cloud_formation.py
View File

@ -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)