From 876f202e7fad83a36bfc785c83d9c8683f6bd55e Mon Sep 17 00:00:00 2001 From: Saikumar Pulluri Date: Fri, 18 Jul 2025 13:03:11 -0400 Subject: [PATCH] Add barbican set up to devstack Configuring barbican stanza parameters when barbican service is enabled for DevStack. Depends-on: https://review.opendev.org/c/openstack/barbican/+/958845 Change-Id: I6d0dc57d26308aaaf08a73dff68828cc3ee45cac Signed-off-by: Saikumar Pulluri --- devstack/plugin.sh | 6 ++++++ devstack/settings | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index cf6cd2d4f4..c417fbd85b 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -276,6 +276,12 @@ function configure_manila { echo -"No configured backends, please set a value to MANILA_ENABLED_BACKENDS" exit 1 fi + if is_service_enabled barbican; then + configure_keystone_authtoken_middleware $MANILA_CONF barbican barbican + iniset $MANILA_CONF barbican barbican_endpoint_type $BARBICAN_ENDPOINT_TYPE + iniset $MANILA_CONF barbican auth_endpoint $BARBICAN_KEYSTONE_ENDPOINT + iniset $MANILA_CONF key_manager backend $KEY_MANAGER_BACKEND + fi configure_backends iniset $MANILA_CONF DEFAULT enabled_share_backends $MANILA_ENABLED_BACKENDS diff --git a/devstack/settings b/devstack/settings index 39c739b749..6a8e74a414 100644 --- a/devstack/settings +++ b/devstack/settings @@ -44,6 +44,11 @@ MANILA_CONF_DIR=${MANILA_CONF_DIR:-/etc/manila} MANILA_CONF=$MANILA_CONF_DIR/manila.conf MANILA_API_PASTE_INI=$MANILA_CONF_DIR/api-paste.ini +# barbican defaults +BARBICAN_ENDPOINT_TYPE=${BARBICAN_ENDPOINT_TYPE:-internal} +KEY_MANAGER_BACKEND=${KEY_MANAGER_BACKEND:-barbican} +BARBICAN_KEYSTONE_ENDPOINT=${BARBICAN_KEYSTONE_ENDPOINT:-$KEYSTONE_SERVICE_URI} + # Set this to False to leave "default_share_type" and # "default_share_group_type" configuration options empty. MANILA_CONFIGURE_DEFAULT_TYPES=${MANILA_CONFIGURE_DEFAULT_TYPES:-True}