From 0525333416283fa02c86fc17693c23d53c984f1e Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 13 Apr 2012 17:58:23 +0200 Subject: [PATCH] Show stack description when status is unknown Apply the same improvement that d41193cbff97caf68a5eaa5b105593af17e3339d made for list_stacks to show_stack. Signed-off-by: Zane Bitter --- heat/engine/manager.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/heat/engine/manager.py b/heat/engine/manager.py index d3f81d2504..bf2a84caf7 100644 --- a/heat/engine/manager.py +++ b/heat/engine/manager.py @@ -69,12 +69,8 @@ class EngineManager(manager.Manager): mem['Parameters'] = ps.t['Parameters'] mem['StackStatusReason'] = 'TODO' mem['TimeoutInMinutes'] = 'TODO' - try: - mem['TemplateDescription'] = ps.t['Description'] - mem['StackStatus'] = ps.t['StackStatus'] - except KeyError: - mem['TemplateDescription'] = 'No description' - mem['StackStatus'] = 'unknown' + mem['TemplateDescription'] = ps.t.get('Description', 'No description') + mem['StackStatus'] = ps.t.get('StackStatus', 'unknown') res['stacks'].append(mem) return res