From ca27fe58a637ac4358f9d864a12f197c36fff3e8 Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Wed, 10 Jul 2013 15:39:54 +0400 Subject: [PATCH] TypeError when merging two Heat stacks without arguments Change-Id: Ib05d128bcf66941510ce86eb5e8125f13e68d1d5 --- conductor/commands/cloud_formation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conductor/commands/cloud_formation.py b/conductor/commands/cloud_formation.py index aba8cef..9a6d3d6 100644 --- a/conductor/commands/cloud_formation.py +++ b/conductor/commands/cloud_formation.py @@ -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)