summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-07 20:26:07 +0000
committerGerrit Code Review <review@openstack.org>2014-08-07 20:26:07 +0000
commitb3b59c20d2fa5396eeb43a9e702e01aa6626830e (patch)
treefa359827c7bc1adcadf0f0be867ee8c243ce3fdd /openstackclient
parent043572bc3f8480f297bc7c54713824d842d3538b (diff)
parente2ebeb7fdcb63576db2b59b9c59f782b2a5e7d75 (diff)
downloadpython-openstackclient-b3b59c20d2fa5396eeb43a9e702e01aa6626830e.tar.gz
Merge "user create v2.0 depends on tenantId in response"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/identity/v2_0/user.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 60af6ddb..b291c882 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -99,9 +99,10 @@ class CreateUser(show.ShowOne):
# NOTE(dtroyer): The users.create() method wants 'tenant_id' but
# the returned resource has 'tenantId'. Sigh.
# We're using project_id now inside OSC so there.
- user._info.update(
- {'project_id': user._info.pop('tenantId')}
- )
+ if 'tenantId' in user._info:
+ user._info.update(
+ {'project_id': user._info.pop('tenantId')}
+ )
info = {}
info.update(user._info)