diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-06 13:50:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-06 13:50:32 +0000 |
| commit | 8d5a0fd86e24bc8d992308c63a85e5bd7e76bb90 (patch) | |
| tree | cde075077ac698927177996c2b8adc278654921f /doc/source | |
| parent | 472d4532e6d5273abc07b2c637a1a9de9115a906 (diff) | |
| parent | 50bd56db258a16199463afcdeb2f0579384cc711 (diff) | |
| download | python-openstackclient-8d5a0fd86e24bc8d992308c63a85e5bd7e76bb90.tar.gz | |
Merge "Transfer "ip floating pool list" to "floating ip pool list""
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/command-objects/floating-ip-pool.rst | 15 | ||||
| -rw-r--r-- | doc/source/command-objects/ip-floating-pool.rst | 1 | ||||
| -rw-r--r-- | doc/source/commands.rst | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/doc/source/command-objects/floating-ip-pool.rst b/doc/source/command-objects/floating-ip-pool.rst new file mode 100644 index 00000000..6f074d2d --- /dev/null +++ b/doc/source/command-objects/floating-ip-pool.rst @@ -0,0 +1,15 @@ +================ +floating ip pool +================ + +Compute v2, Network v2 + +floating ip pool list +--------------------- + +List pools of floating IP addresses + +.. program:: floating ip pool list +.. code:: bash + + os floating ip pool list diff --git a/doc/source/command-objects/ip-floating-pool.rst b/doc/source/command-objects/ip-floating-pool.rst index 63a450eb..310974c6 100644 --- a/doc/source/command-objects/ip-floating-pool.rst +++ b/doc/source/command-objects/ip-floating-pool.rst @@ -8,6 +8,7 @@ ip floating pool list --------------------- List pools of floating IP addresses +(Deprecated, please use ``floating ip pool list`` instead) .. program:: ip floating pool list .. code:: bash diff --git a/doc/source/commands.rst b/doc/source/commands.rst index f79ca173..3c488b49 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 +* ``floating ip pool``: (**Compute**, **Network**) - a pool of public IP addresses * ``group``: (**Identity**) a grouping of users * ``host``: (**Compute**) - the physical computer running compute services * ``hypervisor``: (**Compute**) the virtual machine manager |