diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index 2d08c0de3a..333ea37a0d 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -138,7 +138,7 @@ outputs: # BEGIN DOCKER SETTINGS # puppet_config: config_volume: glance_api - puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config + puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config,glance_image_import_config step_config: list_join: - "\n" diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 65938e88ca..ca6c3900e1 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -139,6 +139,16 @@ parameters: Whether to show multiple image locations e.g for copy-on-write support on RBD or Netapp backends. Potential security risk, see glance.conf for more information. type: boolean + GlanceImageImportPlugins: + default: ['no_op'] + description: > + List of enabled Image Import Plugins. Valid values in the list are + 'image_conversion', 'inject_metadata', 'no_op'. + type: comma_delimited_list + GlanceImageConversionOutputFormat: + default: 'raw' + description: Desired output format for image conversion plugin. + type: string GlanceEnabledImportMethods: default: 'web-download' description: > @@ -273,6 +283,8 @@ outputs: glance::api::image_member_quota: {get_param: GlanceImageMemberQuota} glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods} glance::api::node_staging_uri: {get_param: GlanceNodeStagingUri} + glance::api::image_import_plugins: {get_param: GlanceImageImportPlugins} + glance::api::image_conversion_output_format: {get_param: GlanceImageConversionOutputFormat} # NOTE: bind IP is found in hiera replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): diff --git a/releasenotes/notes/enable_image_conversion_parameters-740e5282385444c7.yaml b/releasenotes/notes/enable_image_conversion_parameters-740e5282385444c7.yaml new file mode 100644 index 0000000000..3ccad20b42 --- /dev/null +++ b/releasenotes/notes/enable_image_conversion_parameters-740e5282385444c7.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Add new parameter 'GlanceImageImportPlugins', to enable plugins + used by image import process. + Add parameter 'GlanceImageConversionOutputFormat', to provide desired + output format for image conversion plugin.