openstack/glance
Code Issues Proposed changes

Merge "Add the Docker container format"

Browse Source
This commit is contained in:
Jenkins 2015-12-03 05:10:52 +00:00 committed by Gerrit Code Review
commit 87251828be
7 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/source/formats.rst
View File

@ -106,3 +106,8 @@ You can set your image's container format to one of the following:
* **ova** * **ova**
This indicates what is stored in Glance is an OVA tar archive file This indicates what is stored in Glance is an OVA tar archive file
* **docker**
This indicates what is stored in Glance is a Docker tar archive of
the container filesystem

2
doc/source/glanceapi.rst
View File

@ -427,7 +427,7 @@ The list of metadata headers that Glance accepts are listed below.
* ``x-image-meta-container_format`` * ``x-image-meta-container_format``
This header is required, unless reserving an image. Valid values are one of This header is required, unless reserving an image. Valid values are one of
``aki``, ``ari``, ``ami``, ``bare``, or ``ovf``. ``aki``, ``ari``, ``ami``, ``bare``, ``ovf``, or ``docker``.
For more information, see :doc:`About Disk and Container Formats <formats>`. For more information, see :doc:`About Disk and Container Formats <formats>`.

2
etc/glance-api.conf
View File

@ -963,7 +963,7 @@
# Supported values for the 'container_format' image attribute (list # Supported values for the 'container_format' image attribute (list
# value) # value)
# Deprecated group/name - [DEFAULT]/container_formats # Deprecated group/name - [DEFAULT]/container_formats
#container_formats = ami,ari,aki,bare,ovf,ova #container_formats = ami,ari,aki,bare,ovf,ova,docker
# Supported values for the 'disk_format' image attribute (list value) # Supported values for the 'disk_format' image attribute (list value)
# Deprecated group/name - [DEFAULT]/disk_formats # Deprecated group/name - [DEFAULT]/disk_formats

2
glance/common/config.py
View File

@ -45,7 +45,7 @@ paste_deploy_opts = [
] ]
image_format_opts = [ image_format_opts = [
cfg.ListOpt('container_formats', cfg.ListOpt('container_formats',
default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova'], default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'docker'],
help=_("Supported values for the 'container_format' " help=_("Supported values for the 'container_format' "
"image attribute"), "image attribute"),
deprecated_opts=[cfg.DeprecatedOpt('container_formats', deprecated_opts=[cfg.DeprecatedOpt('container_formats',

3
glance/contrib/plugins/image_artifact/v1/image.py
View File

@ -27,7 +27,8 @@ class ImageAsAnArtifact(definitions.ArtifactType):
mutable=False) mutable=False)
container_format = definitions.String(allowed_values=['ami', 'ari', container_format = definitions.String(allowed_values=['ami', 'ari',
'aki', 'bare', 'aki', 'bare',
'ovf', 'ova'], 'ovf', 'ova',
'docker'],
required=True, required=True,
mutable=False) mutable=False)
min_disk = definitions.Integer(min_value=0, default=0) min_disk = definitions.Integer(min_value=0, default=0)

2
glance/tests/unit/v2/test_images_resource.py
View File

@ -3755,7 +3755,7 @@ class TestImageSchemaFormatConfiguration(test_utils.BaseTestCase):
def test_default_container_formats(self): def test_default_container_formats(self):
schema = glance.api.v2.images.get_schema() schema = glance.api.v2.images.get_schema()
expected = [None, 'ami', 'ari', 'aki', 'bare', 'ovf', 'ova'] expected = [None, 'ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'docker']
actual = schema.properties['container_format']['enum'] actual = schema.properties['container_format']['enum']
self.assertEqual(expected, actual) self.assertEqual(expected, actual)

2
rally-jobs/plugins/plugin_sample.py
View File

@ -39,7 +39,7 @@ class GlancePlugin(scenario.OpenStackScenario):
:param image_name: String used to name the image :param image_name: String used to name the image
:param container_format: Container format of image. :param container_format: Container format of image.
Acceptable formats: ami, ari, aki, bare, and ovf. Acceptable formats: ami, ari, aki, bare, ovf, and docker.
:param image_location: image file location used to upload :param image_location: image file location used to upload
:param disk_format: Disk format of image. Acceptable formats: :param disk_format: Disk format of image. Acceptable formats:
ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, and iso. ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, and iso.