author | Danek Duvall <danek.duvall@oracle.com> |
Mon, 20 Apr 2015 12:35:51 -0700 | |
branch | s11u2-sru |
changeset 4156 | 4b1def16fe9b |
parent 3178 | 77584387a894 |
child 5405 | 66fd59fecd68 |
permissions | -rw-r--r-- |
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to add 'uar' and 'zfs' container and disk formats to |
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
registered image types. Patch has not yet been submitted upstream. |
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
4 |
--- glance-2014.2.2/glance/common/config.py.orig 2014-06-16 14:14:21.107758750 -0600 |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
5 |
+++ glance-2014.2.2/glance/common/config.py 2014-06-16 14:14:34.374672756 -0600 |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
6 |
@@ -41,14 +41,14 @@ |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
7 |
] |
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
8 |
image_format_opts = [ |
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
9 |
cfg.ListOpt('container_formats', |
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
10 |
- default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova'], |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
11 |
+ default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova', 'uar'], |
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
12 |
help=_("Supported values for the 'container_format' " |
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
13 |
"image attribute"), |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
14 |
deprecated_opts=[cfg.DeprecatedOpt('container_formats', |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
15 |
group='DEFAULT')]), |
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
16 |
cfg.ListOpt('disk_formats', |
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
17 |
default=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', |
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
18 |
- 'vdi', 'iso'], |
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
19 |
+ 'vdi', 'iso', 'zfs'], |
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
20 |
help=_("Supported values for the 'disk_format' " |
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
21 |
"image attribute"), |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
22 |
deprecated_opts=[cfg.DeprecatedOpt('disk_formats', |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
23 |