Merge "api-ref: update container_format, disk_format"

api-ref/source/v2/images-parameters-descriptions.inc

@@ -6,12 +6,30 @@
 
     </p>
 
+.. |html-br| raw:: html
+
+    <br />
+
 .. |disk_format_description| replace::
     |p-start|\ The format of the disk.\ |p-end|
-    |p-start|\ Responses may vary based on the configuration available in a
+    |p-start|\ Values may vary based on the configuration available in a
     particular OpenStack cloud. See the :ref:`Image Schema <image-schema>`
     response from the cloud itself for the valid values available.\ |p-end|
     |p-start|\ Example formats are: ``ami``, ``ari``, ``aki``, ``vhd``,
-    ``vhdx``, ``vmdk``, ``raw``, ``qcow2``, ``vdi``, or ``iso``.\ |p-end|
+    ``vhdx``, ``vmdk``, ``raw``, ``qcow2``, ``vdi``, ``ploop`` or
+    ``iso``.\ |p-end|
+    |p-start|\ The value might be ``null`` (JSON null data type).\ |p-end|
+    |p-start|\
+    **Newton changes**: The ``vhdx`` disk format is a supported
+    value.\ |html-br|
+    **Ocata changes**: The ``ploop`` disk format is a supported
+    value.\ |p-end|
+
+.. |container_format_description| replace::
+    |p-start|\ Format of the image container.\ |p-end|
+    |p-start|\ Values may vary based on the configuration available in a
+    particular OpenStack cloud. See the :ref:`Image Schema <image-schema>`
+    response from the cloud itself for the valid values available.\ |p-end|
+    |p-start|\ Example formats are: ``ami``, ``ari``, ``aki``, ``bare``,
+    ``ovf``, ``ova``, or ``docker``.\ |p-end|
     |p-start|\ The value might be ``null`` (JSON null data type).\ |p-end|
-    **Newton changes**: The ``vhdx`` disk format is a supported value.

api-ref/source/v2/images-parameters.yaml

@@ -256,17 +256,13 @@ checksum:
   type: string
 container_format:
   description: |
-    Format of the image container. A valid value is one of
-    ``ami``, ``ari``, ``aki``, ``bare``, ``ovf``, ``ova``, or
-    ``docker``.  The value might be ``null`` (JSON null data type).
+    |container_format_description|
   in: body
   required: true
   type: enum
 container_format-in-request:
   description: |
-    Format of the image container. A valid value is one of
-    ``ami``, ``ari``, ``aki``, ``bare``, ``ovf``, ``ova``, or
-    ``docker``.
+    |container_format_description|
   in: body
   required: false
   type: enum