Merge "Add support for Glance disk_formats configuration"

deployment/glance/glance-api-container-puppet.yaml

@@ -154,6 +154,12 @@ parameters:
       List of enabled Image Import Plugins. Valid values in the list are
       'image_conversion', 'inject_metadata', 'no_op'.
     type: comma_delimited_list
+  GlanceDiskFormats:
+    default: ''
+    description: >
+      List of allowed disk formats in Glance; all formats are allowed when
+      left unset.
+    type: comma_delimited_list
   GlanceImageConversionOutputFormat:
     default: 'raw'
     description: Desired output format for image conversion plugin.
@@ -516,6 +522,11 @@ outputs:
               glance::api::filesystem_store_metadata_file: '/etc/glance/glance-metadata-file.json'
               glance::api::filesystem_store_file_perm: '0644'
             - {}
+          -
+            if:
+            - {equals: [{get_param: GlanceDiskFormats}, []]}
+            - {}
+            - glance::api::disk_formats: {get_param: GlanceDiskFormats}
           - glance::api::sync_db: false
       service_config_settings:
         mysql: