Merge "Update api-ref to add newly supported 'vhdx' disk format option."

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

@@ -0,0 +1,17 @@
+.. |p-start| raw:: html
+
+    <p>
+
+.. |p-end| raw:: html
+
+    </p>
+
+.. |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
+    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|
+    |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

@@ -290,16 +290,13 @@ direct_url:
   type: string
 disk_format:
   description: |
-    The format of the disk. A valid value is ``ami``, ``ari``, ``aki``,
-    ``vhd``, ``vmdk``, ``raw``, ``qcow2``, ``vdi``, or ``iso``.  The value
-    might be ``null`` (JSON null data type).
+    |disk_format_description|
   in: body
   required: true
   type: enum
 disk_format-in-request:
   description: |
-    The format of the disk. A valid value is ``ami``, ``ari``, ``aki``,
-    ``vhd``, ``vmdk``, ``raw``, ``qcow2``, ``vdi``, or ``iso``.
+    |disk_format_description|
   in: body
   required: false
   type: enum

api-ref/source/v2/index.rst

@@ -22,6 +22,7 @@ Image Service API v2 (CURRENT)
 
 .. rest_expand_all::
 
+.. include:: images-parameters-descriptions.inc
 .. include:: images-images-v2.inc
 .. include:: images-sharing-v2.inc
 .. include:: images-tags.inc

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

@@ -67,6 +67,7 @@
                 "ari",
                 "aki",
                 "vhd",
+                "vhdx",
                 "vmdk",
                 "raw",
                 "qcow2",

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

@@ -88,6 +88,7 @@
                             "ari",
                             "aki",
                             "vhd",
+                            "vhdx",
                             "vmdk",
                             "raw",
                             "qcow2",