openstack
/
heat
Code Issues Proposed changes

Fix exception handling in AccessKey fetching 

bug 1087527

Change-Id: I3de5b27e927ac18aa91f124cd5ef0333c1a83fe2
Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2012-12-07 17:12:41 +01:00
parent 0c8416537b
commit 0b19eea189
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/resources/user.py
View File

@ -139,11 +139,13 @@ class AccessKey(resource.Resource):
logger.warn('could not get secret for %s Error:%s' %
(self.properties['UserName'],
str(ex)))
if kp.access == self.resource_id:
self._secret = kp.secret
else:
logger.error("Unexpected ec2 keypair, for %s access %s" %
(user_id, kp.access))
if kp.access == self.resource_id:
self._secret = kp.secret
else:
msg = ("Unexpected ec2 keypair, for %s access %s" %
(user_id, kp.access))
logger.error(msg)
return self._secret or '000-000-000'