diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-06 16:50:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-06 16:50:19 +0000 |
| commit | 8b9f45c1626de1f95f20397c46416b71a142f70a (patch) | |
| tree | c4b243da1c58bf224b8b2938bf84c31a7f0f38fc /openstackclient | |
| parent | 95b185339648790a9efbef2d187426c8cf3ef2a1 (diff) | |
| parent | 1a25cbaf8f2c1643181ef6233f72a57aaac5404d (diff) | |
| download | python-openstackclient-8b9f45c1626de1f95f20397c46416b71a142f70a.tar.gz | |
Merge "Followup for ec2 credentials command fix"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v2_0/ec2creds.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py index 7a4dea66..a20ffd4b 100644 --- a/openstackclient/identity/v2_0/ec2creds.py +++ b/openstackclient/identity/v2_0/ec2creds.py @@ -71,6 +71,12 @@ class CreateEC2Creds(show.ShowOne): info = {} info.update(creds._info) + + if 'tenant_id' in info: + info.update( + {'project_id': info.pop('tenant_id')} + ) + return zip(*sorted(six.iteritems(info))) @@ -183,4 +189,10 @@ class ShowEC2Creds(show.ShowOne): info = {} info.update(creds._info) + + if 'tenant_id' in info: + info.update( + {'project_id': info.pop('tenant_id')} + ) + return zip(*sorted(six.iteritems(info))) |