openstack/manila
Code Issues Proposed changes

Merge "Add barbican set up to devstack"

Browse Source
This commit is contained in:
Zuul
2025-09-09 22:09:07 +00:00
committed by Gerrit Code Review
parent 756d5f1200 876f202e7f
commit 60b8628dd9
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@@ -276,6 +276,12 @@ function configure_manila {
echo -"No configured backends, please set a value to MANILA_ENABLED_BACKENDS" echo -"No configured backends, please set a value to MANILA_ENABLED_BACKENDS"
exit 1 exit 1
fi 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 configure_backends
iniset $MANILA_CONF DEFAULT enabled_share_backends $MANILA_ENABLED_BACKENDS iniset $MANILA_CONF DEFAULT enabled_share_backends $MANILA_ENABLED_BACKENDS

5
devstack/settings
View File

@@ -44,6 +44,11 @@ MANILA_CONF_DIR=${MANILA_CONF_DIR:-/etc/manila}
MANILA_CONF=$MANILA_CONF_DIR/manila.conf MANILA_CONF=$MANILA_CONF_DIR/manila.conf
MANILA_API_PASTE_INI=$MANILA_CONF_DIR/api-paste.ini 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 # Set this to False to leave "default_share_type" and
# "default_share_group_type" configuration options empty. # "default_share_group_type" configuration options empty.
MANILA_CONFIGURE_DEFAULT_TYPES=${MANILA_CONFIGURE_DEFAULT_TYPES:-True} MANILA_CONFIGURE_DEFAULT_TYPES=${MANILA_CONFIGURE_DEFAULT_TYPES:-True}