summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-22 19:23:20 +0000
committerGerrit Code Review <review@openstack.org>2016-01-22 19:23:20 +0000
commitee78fb2f782d3508cfa59df998d83f34963174ae (patch)
treef8f1029fc043c73d68267d0012290aa2f7f157cd /doc
parent09be6a439a48c277af78346ce776de2df8830e98 (diff)
parenta8ec2ac49475c60c8e72a0fc3db6df778918bb49 (diff)
downloadpython-openstackclient-ee78fb2f782d3508cfa59df998d83f34963174ae.tar.gz
Merge "Support listing volume availability zones"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/command-objects/availability-zone.rst12
-rw-r--r--doc/source/commands.rst2
2 files changed, 12 insertions, 2 deletions
diff --git a/doc/source/command-objects/availability-zone.rst b/doc/source/command-objects/availability-zone.rst
index 37435230..8c021529 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
+Compute v2, Block Storage v2
availability zone list
----------------------
@@ -13,8 +13,18 @@ List availability zones and their status
.. code:: bash
os availability zone list
+ [--compute]
+ [--volume]
[--long]
+.. option:: --compute
+
+ List compute availability zones
+
+.. option:: --volume
+
+ List volume availability zones
+
.. option:: --long
List additional fields in output
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index f7e8b444..fbc3af4a 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**) a logical partition of hosts or block storage services
+* ``availability zone``: (**Compute**, **Volume**) a logical partition of hosts or block storage services
* ``aggregate``: (**Compute**) a grouping of servers
* ``backup``: (**Volume**) a volume copy
* ``catalog``: (**Identity**) service catalog