Delay calling _get_user() until AccessKey is created

Change-Id: I149909d9677f348edd415d3e5f37322b8ad33d28
Fixes: bug #1153397

diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py
index 5e7bd563cdb1ef2cab0d68a303cec19b44d97692..8342ce683caf9d9371c47d3e455918b3c21b2239 100644 (file)
--- a/heat/engine/resources/user.py
+++ b/heat/engine/resources/user.py
@@ -169,7 +169,6 @@ class AccessKey(resource.Resource):
         '''
         Return the user's access key, fetching it from keystone if necessary
         '''
-        user_id = self._get_user().resource_id
         if self._secret is None:
             if not self.resource_id:
                 logger.warn('could not get secret for %s Error:%s' %
@@ -177,6 +176,7 @@ class AccessKey(resource.Resource):
                             "resource_id not yet set"))
             else:
                 try:
+                    user_id = self._get_user().resource_id
                     kp = self.keystone().get_ec2_keypair(user_id)
                 except Exception as ex:
                     logger.warn('could not get secret for %s Error:%s' %