Merge "Add ploop to supported disk_formats"

api-ref/source/v2/samples/schemas-image-show-response.json

@@ -72,7 +72,8 @@
                 "raw",
                 "qcow2",
                 "vdi",
-                "iso"
+                "iso",
+                "ploop"
             ],
             "type": [
                 "null",

api-ref/source/v2/samples/schemas-images-list-response.json

@@ -93,7 +93,8 @@
                             "raw",
                             "qcow2",
                             "vdi",
-                            "iso"
+                            "iso",
+                            "ploop"
                         ],
                         "type": [
                             "null",

doc/source/configuring.rst

@@ -1699,4 +1699,4 @@ done by setting the ``disk_formats`` parameter which is found in the
 
 * ``disk_formats=<Comma separated list of disk formats>``
 
-Optional. Default: ``ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso``
+Optional. Default: ``ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,ploop``

doc/source/formats.rst

@@ -59,6 +59,10 @@ You can set your image's disk format to one of the following:
 
   An archive format for the data contents of an optical disc (e.g. CDROM).
 
+* **ploop**
+
+  A disk format supported and used by Virtuozzo to run OS Containers
+
 * **qcow2**
 
   A disk format supported by the QEMU emulator that can expand dynamically and

doc/source/glanceapi.rst

@@ -514,7 +514,7 @@ The list of metadata headers that Glance accepts are listed below.
 
   This header is required, unless reserving an image. Valid values are one of
   ``aki``, ``ari``, ``ami``, ``raw``, ``iso``, ``vhd``, ``vhdx``, ``vdi``,
-  ``qcow2``, or ``vmdk``.
+  ``qcow2``, ``vmdk`` or ``ploop``.
 
   For more information, see :doc:`About Disk and Container Formats <formats>`.
 

etc/glance-api.conf

@@ -3266,7 +3266,7 @@
 
 # Supported values for the 'disk_format' image attribute (list value)
 # Deprecated group/name - [DEFAULT]/disk_formats
-#disk_formats = ami,ari,aki,vhd,vhdx,vmdk,raw,qcow2,vdi,iso
+#disk_formats = ami,ari,aki,vhd,vhdx,vmdk,raw,qcow2,vdi,iso,ploop
 
 
 [keystone_authtoken]

glance/common/config.py

@@ -94,7 +94,7 @@ image_format_opts = [
                                                    group='DEFAULT')]),
     cfg.ListOpt('disk_formats',
                 default=['ami', 'ari', 'aki', 'vhd', 'vhdx', 'vmdk', 'raw',
-                         'qcow2', 'vdi', 'iso'],
+                         'qcow2', 'vdi', 'iso', 'ploop'],
                 help=_("Supported values for the 'disk_format' "
                        "image attribute"),
                 deprecated_opts=[cfg.DeprecatedOpt('disk_formats',

glance/tests/unit/v2/test_images_resource.py

@@ -3837,7 +3837,7 @@ class TestImageSchemaFormatConfiguration(test_utils.BaseTestCase):
     def test_default_disk_formats(self):
         schema = glance.api.v2.images.get_schema()
         expected = [None, 'ami', 'ari', 'aki', 'vhd', 'vhdx', 'vmdk',
-                    'raw', 'qcow2', 'vdi', 'iso']
+                    'raw', 'qcow2', 'vdi', 'iso', 'ploop']
         actual = schema.properties['disk_format']['enum']
         self.assertEqual(expected, actual)
 

releasenotes/notes/add-ploop-format-fdd583849504ab15.yaml

@@ -0,0 +1,11 @@
+---
+prelude: >
+  - Add ``ploop`` to the list of supported disk formats.
+features:
+  - The identifier ``ploop`` has been added to the list of
+    supported disk formats in Glance. The respective
+    configuration option has been updated and the default
+    list shows ``ploop`` as a supported format.
+upgrade:
+  - The ``disk_format`` config option enables ``ploop`` as
+    supported by default.