summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-06 08:20:15 +0000
committerGerrit Code Review <review@openstack.org>2016-06-06 08:20:15 +0000
commit9661354979b9effe5fee7caa9a155041a3579f6b (patch)
tree3cf5670cc8accf2ddfd8193458b04d63927a3252 /doc
parent36bbf9b3659ceab27b0cabc1b993a84ba8d07af5 (diff)
parenteab6cdebdc28c7eaaf330bbf6c9261c4eedf4dce (diff)
downloadpython-openstackclient-9661354979b9effe5fee7caa9a155041a3579f6b.tar.gz
Merge "Add network availability for osc"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/command-objects/ip-availability.rst (renamed from doc/source/specs/ip-availability.rst)7
-rw-r--r--doc/source/commands.rst1
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/specs/ip-availability.rst b/doc/source/command-objects/ip-availability.rst
index cf0c71ff..55b78427 100644
--- a/doc/source/specs/ip-availability.rst
+++ b/doc/source/command-objects/ip-availability.rst
@@ -24,12 +24,12 @@ number of allocated IP addresses from that pool.
.. option:: --ip-version {4,6}
- List IP availability for specific version
+ List IP availability of given IP version networks
(Default is 4)
.. option:: --project <project>
- List IP availability for specific project
+ List IP availability of given project
(name or ID)
ip availability show
@@ -57,5 +57,4 @@ subnet within the network as well.
.. _ip_availability_show-network
.. describe:: <network>
- Show network IP availability for specific
- network (name or ID)
+ Show IP availability for a specific network (name or ID)
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 9d164de0..9fb0555d 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -96,6 +96,7 @@ 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 availability``: (**Network**) - details of IP usage of a network
* ``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