Merge "api-ref: add 'compressed' container_format"
This commit is contained in:
commit
3ea17a13a0
@ -14,7 +14,10 @@
|
|||||||
|p-start|\ The format of the disk.\ |p-end|
|
|p-start|\ The format of the disk.\ |p-end|
|
||||||
|p-start|\ Values 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>`
|
particular OpenStack cloud. See the :ref:`Image Schema <image-schema>`
|
||||||
response from the cloud itself for the valid values available.\ |p-end|
|
response from the cloud itself for the valid values available. See
|
||||||
|
`Disk Format
|
||||||
|
<https://docs.openstack.org/glance/latest/user/formats.html#disk-format>`__
|
||||||
|
in the Glance documentation for more information.\ |p-end|
|
||||||
|p-start|\ Example formats are: ``ami``, ``ari``, ``aki``, ``vhd``,
|
|p-start|\ Example formats are: ``ami``, ``ari``, ``aki``, ``vhd``,
|
||||||
``vhdx``, ``vmdk``, ``raw``, ``qcow2``, ``vdi``, ``ploop`` or
|
``vhdx``, ``vmdk``, ``raw``, ``qcow2``, ``vdi``, ``ploop`` or
|
||||||
``iso``.\ |p-end|
|
``iso``.\ |p-end|
|
||||||
@ -29,7 +32,13 @@
|
|||||||
|p-start|\ Format of the image container.\ |p-end|
|
|p-start|\ Format of the image container.\ |p-end|
|
||||||
|p-start|\ Values 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>`
|
particular OpenStack cloud. See the :ref:`Image Schema <image-schema>`
|
||||||
response from the cloud itself for the valid values available.\ |p-end|
|
response from the cloud itself for the valid values available. See
|
||||||
|
`Container Format
|
||||||
|
<https://docs.openstack.org/glance/latest/user/formats.html#container-format>`__
|
||||||
|
in the Glance documentation for more information.\ |p-end|
|
||||||
|p-start|\ Example formats are: ``ami``, ``ari``, ``aki``, ``bare``,
|
|p-start|\ Example formats are: ``ami``, ``ari``, ``aki``, ``bare``,
|
||||||
``ovf``, ``ova``, or ``docker``.\ |p-end|
|
``ovf``, ``ova``, ``docker``, or ``compressed``.\ |p-end|
|
||||||
|p-start|\ The value might be ``null`` (JSON null data type).\ |p-end|
|
|p-start|\ The value might be ``null`` (JSON null data type).\ |p-end|
|
||||||
|
|p-start|\
|
||||||
|
**Train changes**: The ``compressed`` container format is a supported
|
||||||
|
value.\ |p-end|
|
||||||
|
@ -42,7 +42,8 @@
|
|||||||
"bare",
|
"bare",
|
||||||
"ovf",
|
"ovf",
|
||||||
"ova",
|
"ova",
|
||||||
"docker"
|
"docker",
|
||||||
|
"compressed"
|
||||||
],
|
],
|
||||||
"type": [
|
"type": [
|
||||||
"null",
|
"null",
|
||||||
|
@ -63,7 +63,8 @@
|
|||||||
"bare",
|
"bare",
|
||||||
"ovf",
|
"ovf",
|
||||||
"ova",
|
"ova",
|
||||||
"docker"
|
"docker",
|
||||||
|
"compressed"
|
||||||
],
|
],
|
||||||
"type": [
|
"type": [
|
||||||
"null",
|
"null",
|
||||||
|
Loading…
Reference in New Issue
Block a user