summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-04 00:40:09 +0000
committerGerrit Code Review <review@openstack.org>2016-02-04 00:40:09 +0000
commit48697de28fde6bdf449f6cdc035d9fad56c7c50d (patch)
tree122268b0877d6e4e4f8fbbe3e581ad809710952a /doc/source
parente4c0d8583dbff3057f144cd6a5c1461ae06dbc67 (diff)
parent4d332defbc4231f77b7459d4abda88a36a65d37d (diff)
downloadpython-openstackclient-48697de28fde6bdf449f6cdc035d9fad56c7c50d.tar.gz
Merge "Support listing network availability zones"
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/availability-zone.rst7
-rw-r--r--doc/source/commands.rst2
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/source/command-objects/availability-zone.rst b/doc/source/command-objects/availability-zone.rst
index 8c021529..1f568438 100644
--- a/doc/source/command-objects/availability-zone.rst
+++ b/doc/source/command-objects/availability-zone.rst
@@ -2,7 +2,7 @@
availability zone
=================
-Compute v2, Block Storage v2
+Block Storage v2, Compute v2, Network v2
availability zone list
----------------------
@@ -14,6 +14,7 @@ List availability zones and their status
os availability zone list
[--compute]
+ [--network]
[--volume]
[--long]
@@ -21,6 +22,10 @@ List availability zones and their status
List compute availability zones
+.. option:: --network
+
+ List network availability zones
+
.. option:: --volume
List volume availability zones
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index f5484b21..1c4f84b2 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -70,7 +70,7 @@ the API resources will be merged, as in the ``quota`` object that has options
referring to both Compute and Volume quotas.
* ``access token``: (**Identity**) long-lived OAuth-based token
-* ``availability zone``: (**Compute**, **Volume**) a logical partition of hosts or block storage services
+* ``availability zone``: (**Compute**, **Network**, **Volume**) a logical partition of hosts or block storage or network services
* ``aggregate``: (**Compute**) a grouping of servers
* ``backup``: (**Volume**) a volume copy
* ``catalog``: (**Identity**) service catalog