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

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

1607N/A

1607N/Adiff --git a/glance/api/v1/images.py b/glance/api/v1/images.py

1607N/Aindex 4993a28..a4efe16 100644

1607N/A--- a/glance/api/v1/images.py

1607N/A+++ b/glance/api/v1/images.py

1607N/A@@ -55,9 +55,9 @@ CONF = cfg.CONF

1607N/A LOG = logging.getLogger(__name__)

1607N/A SUPPORTED_PARAMS = glance.api.v1.SUPPORTED_PARAMS

1607N/A SUPPORTED_FILTERS = glance.api.v1.SUPPORTED_FILTERS

1607N/A-CONTAINER_FORMATS = ['ami', 'ari', 'aki', 'bare', 'ovf']

1607N/A+CONTAINER_FORMATS = ['ami', 'ari', 'aki', 'bare', 'ovf', 'uar']

1607N/A DISK_FORMATS = ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi',

1607N/A- 'iso']

1607N/A+ 'iso', 'zfs']

1607N/A

1607N/A

1607N/A def validate_image_meta(req, values):

1607N/Adiff --git a/glance/api/v2/images.py b/glance/api/v2/images.py

1607N/Aindex 3121b25..32090c9 100644

1607N/A--- a/glance/api/v2/images.py

1607N/A+++ b/glance/api/v2/images.py

1607N/A@@ -520,14 +520,14 @@ _BASE_PROPERTIES = {

1607N/A 'type': 'string',

1607N/A 'description': _(''),

1607N/A 'type': 'string',

1607N/A- 'enum': ['bare', 'ovf', 'ami', 'aki', 'ari'],

1607N/A+ 'enum': ['bare', 'ovf', 'ami', 'aki', 'ari', 'uar'],

1607N/A },

1607N/A 'disk_format': {

1607N/A 'type': 'string',

1607N/A 'description': _(''),

1607N/A 'type': 'string',

1607N/A 'enum': ['raw', 'vhd', 'vmdk', 'vdi', 'iso', 'qcow2',

1607N/A- 'aki', 'ari', 'ami'],

+ 'aki', 'ari', 'ami', 'zfs'],

},

'created_at': {

'type': 'string',