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

2900N/A--- glance-2013.2.3/glance/domain/__init__.py.orig 2014-04-03 11:43:55.000000000 -0700

2900N/A+++ glance-2013.2.3/glance/domain/__init__.py 2014-04-10 00:27:51.161800689 -0700

2900N/A@@ -23,12 +23,12 @@

2605N/A

2900N/A image_format_opts = [

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

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

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

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

2900N/A "image attribute")),

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' "

2900N/A "image attribute")),

2900N/A ]