From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 7 Dec 2012 16:12:41 +0000 (+0100)
Subject: Fix exception handling in AccessKey fetching
X-Git-Tag: 2014.1~1110
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0b19eea189e1eddbf1e72a8935dc7a4c42b1deeb;p=openstack-build%2Fheat-build.git

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 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'