stackforge-attic/murano-conductor
Code Issues Proposed changes

TypeError when merging two Heat stacks without arguments

Browse Source 
Change-Id: Ib05d128bcf66941510ce86eb5e8125f13e68d1d5
This commit is contained in:
Stan Lagun 2013-07-10 15:39:54 +04:00 committed by Gerrit Code Review
parent 87c66644e8
commit ca27fe58a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conductor/commands/cloud_formation.py
View File

@ -59,8 +59,8 @@ class HeatExecutor(CommandBase):
if command == 'CreateOrUpdate':
return self._execute_create_update(
kwargs['template'],
kwargs.get('mappings', {}),
kwargs.get('arguments', {}),
kwargs.get('mappings') or {},
kwargs.get('arguments') or {},
callback)
elif command == 'Delete':
return self._execute_delete(callback)