Fix 'heat list' when there are no stacks

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index 00bd0b192ff589532b867b4a388d4c5ba31ebe4b..ea5eb4a5d2f85e03e2253390af809c1dbed2966d 100644 (file)
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -55,8 +55,9 @@ class StackController(object):
 
         res = {'ListStacksResponse': {'ListStacksResult': {'StackSummaries': [] } } }
         summaries = res['ListStacksResponse']['ListStacksResult']['StackSummaries']
-        for s in stack_list['stacks']:
-            summaries.append(s)
+        if stack_list != None:
+            for s in stack_list['stacks']:
+                summaries.append(s)
 
         return res
 

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 7172fc1132530d71f9fcab49ab29e8cd3fe4cf3d..3d591c3b92946a3f530100fa6e6cec610acdb4bd 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -40,6 +40,8 @@ class EngineManager(manager.Manager):
         logger.info('context is %s' % context)
         res = {'stacks': [] }
         stacks = db_api.stack_get_all(None)
+        if stacks == None:
+            return res
         for s in stacks:
             ps = parser.Stack(s.name, s.raw_template.template, params)
             mem = {}