From 7a673f6d697ff4741cd71d1ab1210d4ae96a76c7 Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Thu, 10 May 2018 14:08:06 -0400 Subject: [PATCH] Add ability to control Glance's enabled_import_methods Add GlanceEnabledImportMethods parameter, and set the default value to restrict Glance from using its 'glance-direct' import method. The glance-direct method requires a special configuration when deployed in an HA environment, and that capability will be added in a later release. Closes-Bug: #1765439 Depends-On: https://review.openstack.org/568550 Change-Id: I7038601d7505a60df2a1fb7fd8db818efa105341 (cherry picked from commit 383836ad33a07a17ebe4cd870c2560b5923d9a61) --- puppet/services/glance-api.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 4dd720bfd1..febcd98114 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -131,6 +131,12 @@ parameters: default: false description: Whether to enable or not the Rbd backend for Nova 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 RabbitPassword: description: The password for RabbitMQ type: string @@ -237,6 +243,7 @@ outputs: glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} glance::api::os_region_name: {get_param: KeystoneRegion} glance::api::image_member_quota: {get_param: GlanceImageMemberQuota} + glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods} # NOTE: bind IP is found in Heat replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api):