summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-02 13:11:30 +0000
committerGerrit Code Review <review@openstack.org>2016-12-02 13:11:30 +0000
commit2de45c2805ff7843d0c92c46b6ada625620b57c9 (patch)
treee69214994707ee70568593182f607095b0acbc44 /doc/source/command-objects
parentc0dd8086e5d811f2ca7d634fd730f8703bbe7924 (diff)
parentf15352f8613d73b003abc5fe4da9ff23229895c8 (diff)
downloadpython-openstackclient-2de45c2805ff7843d0c92c46b6ada625620b57c9.tar.gz
Merge "clean up image choices and help text"
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/image.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 842eab8d..5184f446 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -78,7 +78,8 @@ Create/upload an image
.. option:: --disk-format <disk-format>
- Image disk format (default: raw)
+ Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
+ raw, qcow2, vhdx, vdi, and iso. The default format is: raw
.. option:: --size <size>
@@ -337,7 +338,8 @@ Set image properties
.. option:: --disk-format <disk-format>
- Image disk format (default: raw)
+ Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
+ raw, qcow2, vhdx, vdi, and iso.
.. option:: --size <size>