From: Angus Salkeld <asalkeld@redhat.com>
Date: Mon, 2 Apr 2012 03:54:47 +0000 (+1000)
Subject: Fix keystone creds in parser
X-Git-Tag: 2014.1~2107
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7daa8884bdd2a8bdc550d39c6b86ea3eec407b1c;p=openstack-build%2Fheat-build.git

Fix keystone creds in parser

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

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 7389ca18..6783d3ce 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -42,7 +42,10 @@ class Stack:
 
         if parms != None:
             self._apply_user_parameters(parms)
-        self.creds = parms['KeyStoneCreds']
+        if isinstance(parms['KeyStoneCreds'], (basestring, unicode)):
+            self.creds = eval(parms['KeyStoneCreds'])
+        else:
+            self.creds = parms['KeyStoneCreds']
 
         self.resources = {}
         for r in self.t['Resources']: