summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Feoktistov <mfeoktistov@virtuozzo.com>2016-12-15 19:29:55 +0300
committerSteve Martinelli <s.martinelli@gmail.com>2016-12-15 12:46:55 -0500
commit63377f25fc7dfae151bab2f6e82002a9a1944e93 (patch)
tree2f13993d6be1dbd43588f83b39a79581e3fb0758
parente24deda9cf473491204c0bf54c260c6fcf15a1b5 (diff)
downloadpython-openstackclient-63377f25fc7dfae151bab2f6e82002a9a1944e93.tar.gz
Add ploop to supported disk formats
This format is used for containers for Virtuozzo hypervisor Closes-Bug: 1650342 Change-Id: Ic79f29a1fe9ea5016d3d5520c2b06e39da01ff61
-rw-r--r--doc/source/command-objects/image.rst4
-rw-r--r--openstackclient/image/v1/image.py2
-rw-r--r--openstackclient/image/v2/image.py2
-rw-r--r--releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml5
4 files changed, 9 insertions, 4 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 7fc33c69..9564f099 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -79,7 +79,7 @@ Create/upload an image
.. option:: --disk-format <disk-format>
Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
- raw, qcow2, vhdx, vdi, and iso. The default format is: raw
+ raw, qcow2, vhdx, vdi, iso, and ploop. The default format is: raw
.. option:: --size <size>
@@ -339,7 +339,7 @@ Set image properties
.. option:: --disk-format <disk-format>
Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
- raw, qcow2, vhdx, vdi, and iso.
+ raw, qcow2, vhdx, vdi, iso, and ploop.
.. option:: --size <size>
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index eb79cd2f..1f239b67 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -39,7 +39,7 @@ from openstackclient.i18n import _
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
DISK_CHOICES = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2", "vhdx",
- "vdi", "iso"]
+ "vdi", "iso", "ploop"]
LOG = logging.getLogger(__name__)
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 1d167605..55eb7eb1 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -33,7 +33,7 @@ from openstackclient.identity import common
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
DISK_CHOICES = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2", "vhdx",
- "vdi", "iso"]
+ "vdi", "iso", "ploop"]
LOG = logging.getLogger(__name__)
diff --git a/releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml b/releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml
new file mode 100644
index 00000000..345d6831
--- /dev/null
+++ b/releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - Add ``ploop`` as a valid disk format choice for ``image create``
+ and ``image set`` commands.
+ [Bug `1650342 <https://bugs.launchpad.net/bugs/1650342>`_]