From 05dbd476193d650a33a8424a66bddbc42a3b226d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 13 May 2021 17:00:26 +0900 Subject: [PATCH] Glance: Update puppet parameters to set castellan options Depends-on: https://review.opendev.org/772141 Depends-on: https://review.opendev.org/791062 Change-Id: I8a4c8450914d89ac4148e7c9d3dc2da822ebd5d5 --- deployment/barbican/barbican-client-puppet.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/deployment/barbican/barbican-client-puppet.yaml b/deployment/barbican/barbican-client-puppet.yaml index 144ba383cc..6e0ff44d86 100644 --- a/deployment/barbican/barbican-client-puppet.yaml +++ b/deployment/barbican/barbican-client-puppet.yaml @@ -27,6 +27,10 @@ parameters: default: {} description: Parameters specific to the role type: json + KeystoneRegion: + type: string + default: 'regionOne' + description: Keystone region for endpoint outputs: role_data: @@ -49,9 +53,11 @@ outputs: cinder_volume: *cinder_barbican_config cinder_backup: *cinder_barbican_config glance_api: &glance_barbican_config - glance::api::keymgr_backend: barbican - glance::api::keymgr_encryption_api_url: + glance::key_manager::backend: barbican + glance::key_manager::barbican::barbican_endpoint: get_param: [EndpointMap, BarbicanInternal, uri] - glance::api::keymgr_encryption_auth_url: + glance::key_manager::barbican::auth_endpoint: get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] + glance::key_manager::barbican::barbican_region_name: + get_param: KeystoneRegion glance_api_edge: *glance_barbican_config