From 0b19eea189e1eddbf1e72a8935dc7a4c42b1deeb Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 7 Dec 2012 17:12:41 +0100 Subject: [PATCH] Fix exception handling in AccessKey fetching bug 1087527 Change-Id: I3de5b27e927ac18aa91f124cd5ef0333c1a83fe2 Signed-off-by: Zane Bitter --- heat/engine/resources/user.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py index d14ed46e..cda1b010 100644 --- a/heat/engine/resources/user.py +++ b/heat/engine/resources/user.py @@ -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' -- 2.45.2