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.

     3 

     4 diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py

     5 index 4993a28..a4efe16 100644

     6 --- a/glance/api/v1/images.py

     7 +++ b/glance/api/v1/images.py

     8 @@ -55,9 +55,9 @@ CONF = cfg.CONF

     9  LOG = logging.getLogger(__name__)

    10  SUPPORTED_PARAMS = glance.api.v1.SUPPORTED_PARAMS

    11  SUPPORTED_FILTERS = glance.api.v1.SUPPORTED_FILTERS

    12 -CONTAINER_FORMATS = ['ami', 'ari', 'aki', 'bare', 'ovf']

    13 +CONTAINER_FORMATS = ['ami', 'ari', 'aki', 'bare', 'ovf', 'uar']

    14  DISK_FORMATS = ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi',

    15 -                'iso']

    16 +                'iso', 'zfs']

    17  

    18  

    19  def validate_image_meta(req, values):

    20 diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py

    21 index 3121b25..32090c9 100644

    22 --- a/glance/api/v2/images.py

    23 +++ b/glance/api/v2/images.py

    24 @@ -520,14 +520,14 @@ _BASE_PROPERTIES = {

    25          'type': 'string',

    26          'description': _(''),

    27          'type': 'string',

    28 -        'enum': ['bare', 'ovf', 'ami', 'aki', 'ari'],

    29 +        'enum': ['bare', 'ovf', 'ami', 'aki', 'ari', 'uar'],

    30      },

    31      'disk_format': {

    32          'type': 'string',

    33          'description': _(''),

    34          'type': 'string',

    35          'enum': ['raw', 'vhd', 'vmdk', 'vdi', 'iso', 'qcow2',

    36 -                 'aki', 'ari', 'ami'],

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

    38      },

    39      'created_at': {

    40          'type': 'string',