diff options
| author | Richard Theis <rtheis@us.ibm.com> | 2015-11-24 10:31:07 -0600 |
|---|---|---|
| committer | Richard Theis <rtheis@us.ibm.com> | 2015-11-24 14:03:51 -0600 |
| commit | 325420f6d166aef0b58242918fac464642395b5d (patch) | |
| tree | 625cd78e31b2c74958c5e5eb26fdd91b453a78ee /doc/source/commands.rst | |
| parent | bfa223f61591cf7515265c0ddcacc02797cee055 (diff) | |
| download | python-openstackclient-325420f6d166aef0b58242918fac464642395b5d.tar.gz | |
Doc: Update and add IP address
Fix the 'ip floating' command documentation file name.
Add missing command list documentation for the 'ip fixed'
and 'ip floating pool' commands. In addition, update the
command description and argument help to fix minor issues
and use consistent terminology. And finally, cleanup the
Network command object formatting.
Change-Id: I0168891bc674c9f0d4df4062f7e93f497dc8fe6f
Diffstat (limited to 'doc/source/commands.rst')
| -rw-r--r-- | doc/source/commands.rst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index abeda098..44be8bc7 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -91,13 +91,14 @@ referring to both Compute and Volume quotas. * ``hypervisor stats``: (**Compute**) hypervisor statistics over all compute nodes * ``identity provider``: (**Identity**) a source of users and authentication * ``image``: (**Image**) a disk image -* ``ip fixed``: Compute, Network - an internal IP address assigned to a server -* ``ip floating``: Compute, Network - a public IP address that can be mapped to a server +* ``ip fixed``: (**Compute**, **Network**) - an internal IP address assigned to a server +* ``ip floating``: (**Compute**, **Network**) - a public IP address that can be mapped to a server +* ``ip floating pool``: (**Compute**, **Network**) - a pool of public IP addresses * ``keypair``: (**Compute**) an SSH public key * ``limits``: (**Compute**, **Volume**) resource usage limits * ``mapping``: (**Identity**) a definition to translate identity provider attributes to Identity concepts * ``module``: internal - installed Python modules in the OSC process -* ``network``: Network - a virtual network for connecting servers and other resources +* ``network``: (**Network**) - a virtual network for connecting servers and other resources * ``object``: (**Object Store**) a single file in the Object Store * ``policy``: (**Identity**) determines authorization * ``project``: (**Identity**) owns a group of resources @@ -106,8 +107,8 @@ referring to both Compute and Volume quotas. * ``request token``: (**Identity**) temporary OAuth-based token * ``role``: (**Identity**) a policy object used to determine authorization * ``role assignment``: (**Identity**) a relationship between roles, users or groups, and domains or projects -* ``security group``: Compute, Network - groups of network access rules -* ``security group rule``: Compute, Network - the individual rules that define protocol/IP/port access +* ``security group``: (**Compute**, **Network**) - groups of network access rules +* ``security group rule``: (**Compute**, **Network**) - the individual rules that define protocol/IP/port access * ``server``: (**Compute**) virtual machine instance * ``server image``: (**Compute**) saved server disk image * ``service``: (**Identity**) a cloud service |