openstack/glance
Code Issues Proposed changes

Update documentation.

Browse Source
This commit is contained in:
Donal Lafferty 2011-05-19 10:20:54 +01:00
parent 593fa8e523
commit 2ce002b38b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/formats.rst
View File

@ -49,6 +49,10 @@ You can set your image's container format to one of the following:
A disk format supported by VirtualBox virtual machine monitor and the QEMU A disk format supported by VirtualBox virtual machine monitor and the QEMU
emulator emulator
* **iso**
An archive format for the data contents of an optical disc (e.g. CDROM).
* **qcow2** * **qcow2**
A disk format supported by the QEMU emulator that can expand dynamically and A disk format supported by the QEMU emulator that can expand dynamically and

2
doc/source/glanceapi.rst
View File

@ -272,7 +272,7 @@ The list of metadata headers that Glance accepts are listed below.
* ``x-image-meta-disk-format`` * ``x-image-meta-disk-format``
This header is optional. Valid values are one of ``aki``, ``ari``, ``ami``, This header is optional. Valid values are one of ``aki``, ``ari``, ``ami``,
``raw``, ``vhd``, ``vdi``, ``qcow2``, or ``vmdk``. ``raw``, ``iso``, ``vhd``, ``vdi``, ``qcow2``, or ``vmdk``.
For more information, see :doc:`About Disk and Container Formats <formats>` For more information, see :doc:`About Disk and Container Formats <formats>`