2521N/AIn-house patch to add 'uar' and 'zfs' container and disk formats to

2521N/Aregistered image types. Patch has not yet been submitted upstream.

2521N/A

6850N/A--- glance-12.0.0/glance/common/config.py.~1~ 2016-04-07 00:37:11.000000000 -0700

6850N/A+++ glance-12.0.0/glance/common/config.py 2016-06-27 18:46:02.569983220 -0700

6850N/A@@ -42,14 +42,14 @@ paste_deploy_opts = [

3998N/A ]

2892N/A image_format_opts = [

2892N/A cfg.ListOpt('container_formats',

6850N/A- default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'docker'],

6850N/A+ default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'docker', 'uar'],

2892N/A help=_("Supported values for the 'container_format' "

3998N/A "image attribute"),

3998N/A deprecated_opts=[cfg.DeprecatedOpt('container_formats',

3998N/A group='DEFAULT')]),

2892N/A cfg.ListOpt('disk_formats',

2892N/A default=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2',

2892N/A- 'vdi', 'iso'],

2892N/A+ 'vdi', 'iso', 'zfs'],

2892N/A help=_("Supported values for the 'disk_format' "

3998N/A "image attribute"),

3998N/A deprecated_opts=[cfg.DeprecatedOpt('disk_formats',