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

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

2605N/A

6033N/A--- glance-2015.1.2/glance/common/config.py.~1~ 2015-10-13 09:38:23.000000000 -0700

6033N/A+++ glance-2015.1.2/glance/common/config.py 2016-01-19 12:23:11.283140667 -0800

6033N/A@@ -47,14 +47,14 @@ paste_deploy_opts = [

4070N/A ]

2900N/A image_format_opts = [

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

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

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

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

4070N/A "image attribute"),

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

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

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

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

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

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

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

4070N/A "image attribute"),

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