From 9060187b4d7df19fbcad1b7fddcb0108ca24ad4e Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 11 Mar 2013 17:05:44 +1300 Subject: [PATCH] Delay calling _get_user() until AccessKey is created Change-Id: I149909d9677f348edd415d3e5f37322b8ad33d28 Fixes: bug #1153397 --- heat/engine/resources/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py index 5e7bd563..8342ce68 100644 --- 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' % -- 2.45.2