Enable image import plugins & image output format
Adding GlanceImageImportPlugins & GlanceImageConversionOutputFormat to enable glance image conversion. Since, glance-image-import.conf has been newly added while adding plugin framework in glance, passing the conf file to puppet_tags in docker service. Depends-on: I098aa0cabf2518b8861d5b58b885d9bdef54a7f6 Change-Id: I81b788e38eecb3e0be88b140df3ae1ebb70cb191 Closes-Bug: #1807366
This commit is contained in:
parent
1201d46ee3
commit
9333740b69
@ -121,7 +121,7 @@ outputs:
|
|||||||
# BEGIN DOCKER SETTINGS #
|
# BEGIN DOCKER SETTINGS #
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: glance_api
|
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:
|
step_config:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
|
@ -135,6 +135,16 @@ parameters:
|
|||||||
default: false
|
default: false
|
||||||
description: Whether to enable or not the Rbd backend for Nova
|
description: Whether to enable or not the Rbd backend for Nova
|
||||||
type: boolean
|
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:
|
GlanceEnabledImportMethods:
|
||||||
default: 'web-download'
|
default: 'web-download'
|
||||||
description: >
|
description: >
|
||||||
@ -270,6 +280,8 @@ outputs:
|
|||||||
glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
|
glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
|
||||||
glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}
|
glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}
|
||||||
glance::api::node_staging_uri: {get_param: GlanceNodeStagingUri}
|
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
|
# NOTE: bind IP is found in hiera replacing the network name with the
|
||||||
# local node IP for the given network; replacement examples
|
# local node IP for the given network; replacement examples
|
||||||
# (eg. for internal_api):
|
# (eg. for internal_api):
|
||||||
|
@ -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.
|
Loading…
Reference in New Issue
Block a user