openstack
/
barbican
Code Issues Proposed changes

Merge "devstack: Honor SERVICE_PROTOCOL for endpoints"

This commit is contained in:
Zuul 2020-08-18 14:27:35 +00:00 committed by Gerrit Code Review
parent 79f0f10118 4b52ae7e54
commit 7ee5abbe1f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/barbican
View File

@ -9,6 +9,7 @@
# - functions
# - OS_AUTH_URL for auth in api
# - DEST set to the destination directory
# - SERVICE_PROTOCOL, SERVICE_HOST to define the API endpoints
# - SERVICE_PASSWORD, SERVICE_PROJECT_NAME for auth in api
# - STACK_USER service user
@ -386,12 +387,12 @@ function create_barbican_accounts {
--os-identity-api-version 3 \
--region RegionOne \
$BARBICAN_SERVICE \
public "http://$SERVICE_HOST/key-manager"
public "$SERVICE_PROTOCOL://$SERVICE_HOST/key-manager"
openstack endpoint create \
--os-identity-api-version 3 \
--region RegionOne \
$BARBICAN_SERVICE \
internal "http://$SERVICE_HOST/key-manager"
internal "$SERVICE_PROTOCOL://$SERVICE_HOST/key-manager"
}

2
devstack/settings
View File

@ -36,7 +36,7 @@ GITBRANCH["python-barbicanclient"]=${BARBICANCLIENT_BRANCH:-$TARGET_BRANCH}
GITDIR["python-barbicanclient"]=$DEST/python-barbicanclient
# Set host href
BARBICAN_HOST_HREF=${BARBICAN_HOST_HREF:-http://${SERVICE_HOST}/key-manager}
BARBICAN_HOST_HREF=${BARBICAN_HOST_HREF:-$SERVICE_PROTOCOL://${SERVICE_HOST}/key-manager}
GITREPO["barbican-tempest-plugin"]=${BARBICANTEMPEST_REPO:-${GIT_BASE}/openstack/barbican-tempest-plugin.git}
GITBRANCH["barbican-tempest-plugin"]=${BARBICANTEMPEST_BRANCH:-master}