diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-09 18:20:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-09 18:20:34 +0000 |
| commit | bc53b05f8fc68c274e13b53114e924394600c929 (patch) | |
| tree | 2df8a6d03fb6709e845437f1ff634e331d4f9c6c /doc/source/command-objects/role.rst | |
| parent | 7cf779004e5e9eab9abee8d8a5bc2db3dfa8bd5d (diff) | |
| parent | f7feef7f8d1df7b6a28eb6d2e684bf8f1853d356 (diff) | |
| download | python-openstackclient-bc53b05f8fc68c274e13b53114e924394600c929.tar.gz | |
Merge "Enable specifying domain for group and role commands"
Diffstat (limited to 'doc/source/command-objects/role.rst')
| -rw-r--r-- | doc/source/command-objects/role.rst | 50 |
1 files changed, 46 insertions, 4 deletions
diff --git a/doc/source/command-objects/role.rst b/doc/source/command-objects/role.rst index 3672cfa1..dad5642d 100644 --- a/doc/source/command-objects/role.rst +++ b/doc/source/command-objects/role.rst @@ -101,8 +101,8 @@ List roles .. code:: bash os role list - [--domain <domain> | --project <project] - [--user <user> | --group <group>] + --domain <domain> | --project <project> [--project-domain <project-domain>] + --user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>] .. option:: --domain <domain> @@ -128,6 +128,27 @@ List roles .. versionadded:: 3 +.. option:: --user-domain <user-domain> + + Domain the user belongs to (name or ID). + This can be used in case collisions between user names exist. + + .. versionadded:: 3 + +.. option:: --group-domain <group-domain> + + Domain the group belongs to (name or ID). + This can be used in case collisions between group names exist. + + .. versionadded:: 3 + +.. option:: --project-domain <project-domain> + + Domain the project belongs to (name or ID). + This can be used in case collisions between project names exist. + + .. versionadded:: 3 + role remove ----------- @@ -137,8 +158,8 @@ Remove role from domain/project : user/group .. code:: bash os role remove - [--domain <domain> | --project <project] - [--user <user> | --group <group>] + --domain <domain> | --project <project> [--project-domain <project-domain>] + --user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>] <role> .. option:: --domain <domain> @@ -161,6 +182,27 @@ Remove role from domain/project : user/group .. versionadded:: 3 +.. option:: --user-domain <user-domain> + + Domain the user belongs to (name or ID). + This can be used in case collisions between user names exist. + + .. versionadded:: 3 + +.. option:: --group-domain <group-domain> + + Domain the group belongs to (name or ID). + This can be used in case collisions between group names exist. + + .. versionadded:: 3 + +.. option:: --project-domain <project-domain> + + Domain the project belongs to (name or ID). + This can be used in case collisions between project names exist. + + .. versionadded:: 3 + .. describe:: <role> Role to remove (name or ID) |