diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-06 13:59:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-06 13:59:32 +0000 |
| commit | 7f8999bf540d2c65a1008a1636ff9b623cedb559 (patch) | |
| tree | b2411dbb4cc339a627b66f9de1c60d42ebfe3774 /doc/source/commands.rst | |
| parent | 2b8213df889af6399b556361c99a187a2c719a3a (diff) | |
| parent | 179ebe6d648fc5cff514306076f1b0fa54e64b40 (diff) | |
| download | python-openstackclient-7f8999bf540d2c65a1008a1636ff9b623cedb559.tar.gz | |
Merge "Transfer "ip fixed add/remove" to "server add/remove fixed ip""
Diffstat (limited to 'doc/source/commands.rst')
| -rw-r--r-- | doc/source/commands.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 0ce06647..70f4c8b2 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -91,6 +91,7 @@ referring to both Compute and Volume quotas. * ``extension``: (**Compute**, **Identity**, **Network**, **Volume**) OpenStack server API extensions * ``federation protocol``: (**Identity**) the underlying protocol used while federating identities * ``flavor``: (**Compute**) predefined server configurations: ram, root disk and so on +* ``fixed ip``: (**Compute**, **Network**) - an internal IP address assigned to a server * ``floating ip``: (**Compute**, **Network**) - a public IP address that can be mapped to a server * ``floating ip pool``: (**Compute**, **Network**) - a pool of public IP addresses * ``group``: (**Identity**) a grouping of users |