diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 15:14:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 15:14:20 +0000 |
| commit | 12ccd0e52a705d81afcb2baa57559c2dd9c9d262 (patch) | |
| tree | 231ee022cda59d4e1e5c3b019a2d954742e14c84 | |
| parent | d97510cbd5f8eaf188d35dfae29b47c27b9a22dc (diff) | |
| parent | 70f3ee67e453d8236ab66df7415928bffce34861 (diff) | |
| download | python-keystoneclient-12ccd0e52a705d81afcb2baa57559c2dd9c9d262.tar.gz | |
Merge "Follow up patch for Improve docs for v3 ec2"
| -rw-r--r-- | keystoneclient/v3/ec2.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/keystoneclient/v3/ec2.py b/keystoneclient/v3/ec2.py index 06fac20..d32fbca 100644 --- a/keystoneclient/v3/ec2.py +++ b/keystoneclient/v3/ec2.py @@ -20,6 +20,8 @@ class EC2(base.Resource): * id: a string that identifies the EC2 resource. * user_id: the ID field of a pre-existing user in the backend. * project_id: the ID field of a pre-existing project in the backend. + * access: a string representing access key of the access/secret pair. + * secret: a string representing the secret of the access/secret pair. """ @@ -56,9 +58,8 @@ class EC2Manager(base.ManagerWithFind): :param user_id: the ID of the user whose access/secret pair will be retrieved from the server. :type user_id: str or :class:`keystoneclient.v3.users.User` - :param access: the access key whose access/secret pair will be - retrieved from the server. - :type access: str or :class:`keystoneclient.v3.ec2.EC2` + :param str access: the access key whose access/secret pair will be + retrieved from the server. :returns: the specified access/secret pair returned from server. :rtype: :class:`keystoneclient.v3.ec2.EC2` @@ -86,9 +87,8 @@ class EC2Manager(base.ManagerWithFind): :param user_id: the ID of the user whose access/secret pair will be deleted on the server. :type user_id: str or :class:`keystoneclient.v3.users.User` - :param access: the access key whose access/secret pair will be deleted - on the server. - :type access: str or :class:`keystoneclient.v3.ec2.EC2` + :param str access: the access key whose access/secret pair will be + deleted on the server. :returns: Response object with 204 status. :rtype: :class:`requests.models.Response` |