1 In-house patch to add 'uar' and 'zfs' container and disk formats to |
1 In-house patch to add 'uar' and 'zfs' container and disk formats to |
2 registered image types. Patch has not yet been submitted upstream. |
2 registered image types. Patch has not yet been submitted upstream. |
3 |
3 |
4 --- glance-2013.2.3/glance/domain/__init__.py.orig 2014-04-03 11:43:55.000000000 -0700 |
4 --- glance-2014.2.2/glance/common/config.py.orig 2014-06-16 14:14:21.107758750 -0600 |
5 +++ glance-2013.2.3/glance/domain/__init__.py 2014-04-10 00:27:51.161800689 -0700 |
5 +++ glance-2014.2.2/glance/common/config.py 2014-06-16 14:14:34.374672756 -0600 |
6 @@ -23,12 +23,12 @@ |
6 @@ -41,14 +41,14 @@ |
7 |
7 ] |
8 image_format_opts = [ |
8 image_format_opts = [ |
9 cfg.ListOpt('container_formats', |
9 cfg.ListOpt('container_formats', |
10 - default=['ami', 'ari', 'aki', 'bare', 'ovf'], |
10 - default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova'], |
11 + default=['ami', 'ari', 'aki', 'bare', 'ovf', 'uar'], |
11 + default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'uar'], |
12 help=_("Supported values for the 'container_format' " |
12 help=_("Supported values for the 'container_format' " |
13 "image attribute")), |
13 "image attribute"), |
|
14 deprecated_opts=[cfg.DeprecatedOpt('container_formats', |
|
15 group='DEFAULT')]), |
14 cfg.ListOpt('disk_formats', |
16 cfg.ListOpt('disk_formats', |
15 default=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', |
17 default=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', |
16 - 'vdi', 'iso'], |
18 - 'vdi', 'iso'], |
17 + 'vdi', 'iso', 'zfs'], |
19 + 'vdi', 'iso', 'zfs'], |
18 help=_("Supported values for the 'disk_format' " |
20 help=_("Supported values for the 'disk_format' " |
19 "image attribute")), |
21 "image attribute"), |
20 ] |
22 deprecated_opts=[cfg.DeprecatedOpt('disk_formats', |
|
23 |