diff --git a/doc/source/command-objects/ec2-credentials.rst b/doc/source/command-objects/ec2-credentials.rst
index d675dc8c12..f8e3856485 100644
--- a/doc/source/command-objects/ec2-credentials.rst
+++ b/doc/source/command-objects/ec2-credentials.rst
@@ -20,22 +20,22 @@ Create EC2 credentials
.. option:: --project <project>
- Specify an alternate project (default: current authenticated project)
+ Create credentials in project (name or ID; default: current authenticated project)
.. option:: --user <user>
- Specify an alternate user (default: current authenticated user)
+ Create credentials for user (name or ID; default: current authenticated user)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
.. option:: --project-domain <project-domain>
- Domain the project belongs to (name or ID).
+ Select project from a specific domain (name or ID)
This can be used in case collisions between project names exist.
.. versionadded:: 3
@@ -60,11 +60,11 @@ Delete EC2 credentials
.. option:: --user <user>
- Specify a user
+ Delete credentials for user (name or ID)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
@@ -92,11 +92,11 @@ List EC2 credentials
.. option:: --user <user>
- Filter list by <user>
+ Filter list by <user> (name or ID)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
@@ -120,11 +120,11 @@ Display EC2 credentials details
.. option:: --user <user>
- Specify a user
+ Show credentials for user (name or ID)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index 90553eb1f9..348479ac33 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -37,14 +37,18 @@ class CreateEC2Creds(show.ShowOne):
parser.add_argument(
'--project',
metavar='<project>',
- help=_('Specify an alternate project'
- ' (default: current authenticated project)'),
+ help=_(
+ 'Create credentials in project '
+ '(name or ID; default: current authenticated project)'
+ ),
)
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify an alternate user'
- ' (default: current authenticated user)'),
+ help=_(
+ 'Create credentials for user '
+ '(name or ID; default: current authenticated user)'
+ ),
)
return parser
@@ -97,7 +101,7 @@ class DeleteEC2Creds(command.Command):
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify a user'),
+ help=_('Delete credentials for user (name or ID)'),
)
return parser
@@ -127,7 +131,7 @@ class ListEC2Creds(lister.Lister):
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify a user'),
+ help=_('Filter list by user (name or ID)'),
)
return parser
@@ -170,7 +174,7 @@ class ShowEC2Creds(show.ShowOne):
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify a user'),
+ help=_('Show credentials for user (name or ID)'),
)
return parser
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index c49502c68b..f995ae5553 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -62,28 +62,36 @@ class CreateEC2Creds(show.ShowOne):
parser.add_argument(
'--project',
metavar='<project>',
- help=_('Specify an alternate project'
- ' (default: current authenticated project)'),
+ help=_(
+ 'Create credentials in project '
+ '(name or ID; default: current authenticated project)'
+ ),
)
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify an alternate user'
- ' (default: current authenticated user)'),
+ help=_(
+ 'Create credentials for user '
+ '(name or ID; default: current authenticated user)'
+ ),
)
parser.add_argument(
'--user-domain',
metavar='<user-domain>',
- help=('Domain the user belongs to (name or ID). '
- 'This can be used in case collisions between user names '
- 'exist.')
+ help=(
+ 'Select user from a specific domain (name or ID); '
+ 'This can be used in case collisions between user names '
+ 'exist.'
+ ),
)
parser.add_argument(
'--project-domain',
metavar='<project-domain>',
- help=('Domain the project belongs to (name or ID). '
- 'This can be used in case collisions between project names '
- 'exist.')
+ help=(
+ 'Select project from a specific domain (name or ID); '
+ 'This can be used in case collisions between project names '
+ 'exist.'
+ ),
)
return parser
@@ -139,14 +147,16 @@ class DeleteEC2Creds(command.Command):
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify a user'),
+ help=_('Delete credentials for user (name or ID)'),
)
parser.add_argument(
'--user-domain',
metavar='<user-domain>',
- help=('Domain the user belongs to (name or ID). '
- 'This can be used in case collisions between user names '
- 'exist.')
+ help=(
+ 'Select user from a specific domain (name or ID); '
+ 'This can be used in case collisions between user names '
+ 'exist.'
+ ),
)
return parser
@@ -167,14 +177,16 @@ class ListEC2Creds(lister.Lister):
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify a user'),
+ help=_('Filter list by user (name or ID)'),
)
parser.add_argument(
'--user-domain',
metavar='<user-domain>',
- help=('Domain the user belongs to (name or ID). '
- 'This can be used in case collisions between user names '
- 'exist.')
+ help=(
+ 'Select user from a specific domain (name or ID); '
+ 'This can be used in case collisions between user names '
+ 'exist.'
+ ),
)
return parser
@@ -209,14 +221,16 @@ class ShowEC2Creds(show.ShowOne):
parser.add_argument(
'--user',
metavar='<user>',
- help=_('Specify a user'),
+ help=_('Show credentials for user (name or ID)'),
)
parser.add_argument(
'--user-domain',
metavar='<user-domain>',
- help=('Domain the user belongs to (name or ID). '
- 'This can be used in case collisions between user names '
- 'exist.')
+ help=(
+ 'Select user from a specific domain (name or ID); '
+ 'This can be used in case collisions between user names '
+ 'exist.'
+ ),
)
return parser