summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-16 17:39:21 +0000
committerGerrit Code Review <review@openstack.org>2015-06-16 17:39:21 +0000
commit8ce1549ec260333904584d20b60fe4a5adeef06f (patch)
treeb4d647fec862c50f2dc11df9c4b74c72101e2908 /openstackclient
parentdca47a7bf29c1b0863e823bf058791f0fd8ed4cf (diff)
parent258f4ca6e6ca7fc67c746b77ab23a12065a0660a (diff)
downloadpython-openstackclient-8ce1549ec260333904584d20b60fe4a5adeef06f.tar.gz
Merge "reference corect ec2 helper function"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/identity/v3/ec2creds.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index f995ae55..3c41ba36 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -99,7 +99,7 @@ class CreateEC2Creds(show.ShowOne):
self.log.debug('take_action(%s)', parsed_args)
identity_client = self.app.client_manager.identity
client_manager = self.app.client_manager
- user = self.determine_ec2_user(parsed_args, client_manager)
+ user = _determine_ec2_user(parsed_args, client_manager)
project_domain = None
if parsed_args.project_domain:
@@ -163,7 +163,7 @@ class DeleteEC2Creds(command.Command):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)', parsed_args)
client_manager = self.app.client_manager
- user = self.determine_ec2_user(parsed_args, client_manager)
+ user = _determine_ec2_user(parsed_args, client_manager)
client_manager.identity.ec2.delete(user, parsed_args.access_key)
@@ -193,7 +193,7 @@ class ListEC2Creds(lister.Lister):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)', parsed_args)
client_manager = self.app.client_manager
- user = self.determine_ec2_user(parsed_args, client_manager)
+ user = _determine_ec2_user(parsed_args, client_manager)
columns = ('access', 'secret', 'tenant_id', 'user_id')
column_headers = ('Access', 'Secret', 'Project ID', 'User ID')
@@ -237,7 +237,7 @@ class ShowEC2Creds(show.ShowOne):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)', parsed_args)
client_manager = self.app.client_manager
- user = self.determine_ec2_user(parsed_args, client_manager)
+ user = _determine_ec2_user(parsed_args, client_manager)
creds = client_manager.identity.ec2.get(user, parsed_args.access_key)
info = {}