Fix exception handling in AccessKey fetching

bug 1087527

Change-Id: I3de5b27e927ac18aa91f124cd5ef0333c1a83fe2
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py
index d14ed46e329dadd899ef708afa9a6b9ddd9794c7..cda1b010e6113daa5c7e6a105337d40d9b4a56b1 100644 (file)
--- 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'