diff --git a/devstack/lib/barbican b/devstack/lib/barbican index 9bfdc75b2..6c03782c0 100644 --- a/devstack/lib/barbican +++ b/devstack/lib/barbican @@ -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" } diff --git a/devstack/settings b/devstack/settings index c3f8ac0f3..fcf8ec2ee 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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}