]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Fix keystone creds in parser
authorAngus Salkeld <asalkeld@redhat.com>
Mon, 2 Apr 2012 03:54:47 +0000 (13:54 +1000)
committerAngus Salkeld <asalkeld@redhat.com>
Mon, 2 Apr 2012 03:54:47 +0000 (13:54 +1000)
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
heat/engine/parser.py

index 7389ca186534779c7d0f3ac3933975e08c20a7b6..6783d3ce440ed1c5336cde08a2e9c0929838c49b 100644 (file)
@@ -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']: