diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-04 22:50:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-04 22:50:38 +0000 |
| commit | 3f8b4d2238e6a423695ed3b3305cd9f9bbb51336 (patch) | |
| tree | d10861250b37d20e42d50f0ccc6885cf08f6ec77 /doc/source/commands.rst | |
| parent | 8c9bf316874a2f7261214a8e055b9ffdb9a81025 (diff) | |
| parent | 6a61dbc86fd2b45ea3126ed20f9f863109b794fb (diff) | |
| download | python-openstackclient-3f8b4d2238e6a423695ed3b3305cd9f9bbb51336.tar.gz | |
Merge "Command object docs: catalog, credentials, endpoint, region, token"
Diffstat (limited to 'doc/source/commands.rst')
| -rw-r--r-- | doc/source/commands.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 7b38134e..04c451c8 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -72,13 +72,14 @@ referring to both Compute and Volume quotas. * ``access token``: Identity - long-lived OAuth-based token * ``aggregate``: (**Compute**) a grouping of servers * ``backup``: Volume - a volume copy +* ``catalog``: (**Identity**) service catalog * ``console log``: (**Compute**) server console text dump * ``console url``: (**Compute**) server remote console URL * ``consumer``: Identity - OAuth-based delegatee * ``container``: Object Store - a grouping of objects -* ``credential``: Identity - specific to identity providers +* ``credentials``: (**Identity**) specific to identity providers * ``domain``: Identity - a grouping of projects -* ``endpoint``: Identity - the base URL used to contact a specific service +* ``endpoint``: (**Identity**) the base URL used to contact a specific service * ``extension``: (**Compute**, **Identity**, **Volume**) OpenStack server API extensions * ``flavor``: Compute - pre-defined configurations of servers: ram, root disk, etc * ``group``: Identity - a grouping of users @@ -96,6 +97,7 @@ referring to both Compute and Volume quotas. * ``policy``: Identity - determines authorization * ``project``: (**Identity**) owns a group of resources * ``quota``: (**Compute**, **Volume**) resource usage restrictions +* ``region``: (**Identity**) * ``request token``: Identity - temporary OAuth-based token * ``role``: Identity - a policy object used to determine authorization * ``security group``: Compute, Network - groups of network access rules |