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-2014.2.2/glance/common/config.py.orig 2014-06-16 14:14:21.107758750 -0600 |
4 --- glance-2015.1.2/glance/common/config.py.~1~ 2015-10-13 09:38:23.000000000 -0700 |
5 +++ glance-2014.2.2/glance/common/config.py 2014-06-16 14:14:34.374672756 -0600 |
5 +++ glance-2015.1.2/glance/common/config.py 2016-01-19 12:23:11.283140667 -0800 |
6 @@ -41,14 +41,14 @@ |
6 @@ -47,14 +47,14 @@ paste_deploy_opts = [ |
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', 'ova'], |
10 - default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova'], |
11 + default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'uar'], |
11 + default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'uar'], |
18 - 'vdi', 'iso'], |
18 - 'vdi', 'iso'], |
19 + 'vdi', 'iso', 'zfs'], |
19 + 'vdi', 'iso', 'zfs'], |
20 help=_("Supported values for the 'disk_format' " |
20 help=_("Supported values for the 'disk_format' " |
21 "image attribute"), |
21 "image attribute"), |
22 deprecated_opts=[cfg.DeprecatedOpt('disk_formats', |
22 deprecated_opts=[cfg.DeprecatedOpt('disk_formats', |
23 |
|