Skip to content

Commit 0c5f12a

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Clean up ec2 credentials help text"
2 parents 7f658c0 + 3fa0bbc commit 0c5f12a

3 files changed

Lines changed: 57 additions & 39 deletions

File tree

‎doc/source/command-objects/ec2-credentials.rst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ Create EC2 credentials
2020
2121
.. option:: --project <project>
2222

23-
Specify an alternate project (default: current authenticated project)
23+
Create credentials in project (name or ID; default: current authenticated project)
2424

2525
.. option:: --user <user>
2626

27-
Specify an alternate user (default: current authenticated user)
27+
Create credentials for user (name or ID; default: current authenticated user)
2828

2929
.. option:: --user-domain <user-domain>
3030

31-
Domain the user belongs to (name or ID).
31+
Select user from a specific domain (name or ID)
3232
This can be used in case collisions between user names exist.
3333

3434
.. versionadded:: 3
3535

3636
.. option:: --project-domain <project-domain>
3737

38-
Domain the project belongs to (name or ID).
38+
Select project from a specific domain (name or ID)
3939
This can be used in case collisions between project names exist.
4040

4141
.. versionadded:: 3
@@ -60,11 +60,11 @@ Delete EC2 credentials
6060
6161
.. option:: --user <user>
6262

63-
Specify a user
63+
Delete credentials for user (name or ID)
6464

6565
.. option:: --user-domain <user-domain>
6666

67-
Domain the user belongs to (name or ID).
67+
Select user from a specific domain (name or ID)
6868
This can be used in case collisions between user names exist.
6969

7070
.. versionadded:: 3
@@ -92,11 +92,11 @@ List EC2 credentials
9292
9393
.. option:: --user <user>
9494

95-
Filter list by <user>
95+
Filter list by <user> (name or ID)
9696

9797
.. option:: --user-domain <user-domain>
9898

99-
Domain the user belongs to (name or ID).
99+
Select user from a specific domain (name or ID)
100100
This can be used in case collisions between user names exist.
101101

102102
.. versionadded:: 3
@@ -120,11 +120,11 @@ Display EC2 credentials details
120120
121121
.. option:: --user <user>
122122

123-
Specify a user
123+
Show credentials for user (name or ID)
124124

125125
.. option:: --user-domain <user-domain>
126126

127-
Domain the user belongs to (name or ID).
127+
Select user from a specific domain (name or ID)
128128
This can be used in case collisions between user names exist.
129129

130130
.. versionadded:: 3

‎openstackclient/identity/v2_0/ec2creds.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ def get_parser(self, prog_name):
3737
parser.add_argument(
3838
'--project',
3939
metavar='<project>',
40-
help=_('Specify an alternate project'
41-
' (default: current authenticated project)'),
40+
help=_(
41+
'Create credentials in project '
42+
'(name or ID; default: current authenticated project)'
43+
),
4244
)
4345
parser.add_argument(
4446
'--user',
4547
metavar='<user>',
46-
help=_('Specify an alternate user'
47-
' (default: current authenticated user)'),
48+
help=_(
49+
'Create credentials for user '
50+
'(name or ID; default: current authenticated user)'
51+
),
4852
)
4953
return parser
5054

@@ -97,7 +101,7 @@ def get_parser(self, prog_name):
97101
parser.add_argument(
98102
'--user',
99103
metavar='<user>',
100-
help=_('Specify a user'),
104+
help=_('Delete credentials for user (name or ID)'),
101105
)
102106
return parser
103107

@@ -127,7 +131,7 @@ def get_parser(self, prog_name):
127131
parser.add_argument(
128132
'--user',
129133
metavar='<user>',
130-
help=_('Specify a user'),
134+
help=_('Filter list by user (name or ID)'),
131135
)
132136
return parser
133137

@@ -170,7 +174,7 @@ def get_parser(self, prog_name):
170174
parser.add_argument(
171175
'--user',
172176
metavar='<user>',
173-
help=_('Specify a user'),
177+
help=_('Show credentials for user (name or ID)'),
174178
)
175179
return parser
176180

‎openstackclient/identity/v3/ec2creds.py‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,36 @@ def get_parser(self, prog_name):
6262
parser.add_argument(
6363
'--project',
6464
metavar='<project>',
65-
help=_('Specify an alternate project'
66-
' (default: current authenticated project)'),
65+
help=_(
66+
'Create credentials in project '
67+
'(name or ID; default: current authenticated project)'
68+
),
6769
)
6870
parser.add_argument(
6971
'--user',
7072
metavar='<user>',
71-
help=_('Specify an alternate user'
72-
' (default: current authenticated user)'),
73+
help=_(
74+
'Create credentials for user '
75+
'(name or ID; default: current authenticated user)'
76+
),
7377
)
7478
parser.add_argument(
7579
'--user-domain',
7680
metavar='<user-domain>',
77-
help=('Domain the user belongs to (name or ID). '
78-
'This can be used in case collisions between user names '
79-
'exist.')
81+
help=(
82+
'Select user from a specific domain (name or ID); '
83+
'This can be used in case collisions between user names '
84+
'exist.'
85+
),
8086
)
8187
parser.add_argument(
8288
'--project-domain',
8389
metavar='<project-domain>',
84-
help=('Domain the project belongs to (name or ID). '
85-
'This can be used in case collisions between project names '
86-
'exist.')
90+
help=(
91+
'Select project from a specific domain (name or ID); '
92+
'This can be used in case collisions between project names '
93+
'exist.'
94+
),
8795
)
8896
return parser
8997

@@ -139,14 +147,16 @@ def get_parser(self, prog_name):
139147
parser.add_argument(
140148
'--user',
141149
metavar='<user>',
142-
help=_('Specify a user'),
150+
help=_('Delete credentials for user (name or ID)'),
143151
)
144152
parser.add_argument(
145153
'--user-domain',
146154
metavar='<user-domain>',
147-
help=('Domain the user belongs to (name or ID). '
148-
'This can be used in case collisions between user names '
149-
'exist.')
155+
help=(
156+
'Select user from a specific domain (name or ID); '
157+
'This can be used in case collisions between user names '
158+
'exist.'
159+
),
150160
)
151161
return parser
152162

@@ -167,14 +177,16 @@ def get_parser(self, prog_name):
167177
parser.add_argument(
168178
'--user',
169179
metavar='<user>',
170-
help=_('Specify a user'),
180+
help=_('Filter list by user (name or ID)'),
171181
)
172182
parser.add_argument(
173183
'--user-domain',
174184
metavar='<user-domain>',
175-
help=('Domain the user belongs to (name or ID). '
176-
'This can be used in case collisions between user names '
177-
'exist.')
185+
help=(
186+
'Select user from a specific domain (name or ID); '
187+
'This can be used in case collisions between user names '
188+
'exist.'
189+
),
178190
)
179191
return parser
180192

@@ -209,14 +221,16 @@ def get_parser(self, prog_name):
209221
parser.add_argument(
210222
'--user',
211223
metavar='<user>',
212-
help=_('Specify a user'),
224+
help=_('Show credentials for user (name or ID)'),
213225
)
214226
parser.add_argument(
215227
'--user-domain',
216228
metavar='<user-domain>',
217-
help=('Domain the user belongs to (name or ID). '
218-
'This can be used in case collisions between user names '
219-
'exist.')
229+
help=(
230+
'Select user from a specific domain (name or ID); '
231+
'This can be used in case collisions between user names '
232+
'exist.'
233+
),
220234
)
221235
return parser
222236

0 commit comments

Comments
 (0)