openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add ability to control Glance's enabled_import_methods"

Browse Source
This commit is contained in:
Zuul 2018-05-16 15:26:55 +00:00 committed by Gerrit Code Review
commit b7273d849b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet/services/glance-api.yaml
View File

@ -131,6 +131,12 @@ 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
GlanceEnabledImportMethods:
default: 'web-download'
description: >
List of enabled Image Import Methods. Valid values in the list are
'glance-direct' and 'web-download'
type: comma_delimited_list
KeystoneRegion: KeystoneRegion:
type: string type: string
default: 'regionOne' default: 'regionOne'
@ -237,6 +243,7 @@ outputs:
glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
glance::api::os_region_name: {get_param: KeystoneRegion} glance::api::os_region_name: {get_param: KeystoneRegion}
glance::api::image_member_quota: {get_param: GlanceImageMemberQuota} glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}
# 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):