Add ploop to supported disk formats

mfeoktistov · stevemar · commit 63377f25fc7d · 2016-12-15T12:46:55.000-05:00
This format is used for containers for Virtuozzo hypervisor

Closes-Bug: 1650342

Change-Id: Ic79f29a1fe9ea5016d3d5520c2b06e39da01ff61
diff --git 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
@@ -39,7 +39,7 @@
 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
@@ -33,7 +33,7 @@
 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
@@ -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>`_]
