openstack/barbican
Code Issues Proposed changes

[Devstack] Fix devstack plugin compatibility

Browse Source 
Unbreak barbican gate with recent devstack commit [1].
Fix it by removing dependency on deleted env var in the same way
as it is done in devstack (see [2]).

[1] I7c66e1d8d65f562596543ed8ca402dba8c8ea271
[2] I4e5c7e86aefe72fc21c77d423033e9b169318fec

Change-Id: I351f90a60e4693300cc3d3bbd1183bd8fa6acc9a
Closes-Bug: #1644194
This commit is contained in:
Marc Koderer 2016-11-23 13:13:34 +01:00
parent 8f89bd0bf7
commit 949c8b9698
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
devstack/lib/barbican
View File

@ -352,23 +352,21 @@ function create_barbican_accounts {
# #
# Setup Barbican Endpoint # Setup Barbican Endpoint
# #
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then BARBICAN_SERVICE=$(openstack service create \
BARBICAN_SERVICE=$(openstack service create \ --name barbican \
--name barbican \ --description "Barbican Service" \
--description "Barbican Service" \ 'key-manager' \
'key-manager' \ | grep " id " | get_field 2)
| grep " id " | get_field 2) openstack endpoint create \
openstack endpoint create \ --os-identity-api-version 3 \
--os-identity-api-version 3 \ --region RegionOne \
--region RegionOne \ $BARBICAN_SERVICE \
$BARBICAN_SERVICE \ public "http://$SERVICE_HOST:9311"
public "http://$SERVICE_HOST:9311" openstack endpoint create \
openstack endpoint create \ --os-identity-api-version 3 \
--os-identity-api-version 3 \ --region RegionOne \
--region RegionOne \ $BARBICAN_SERVICE \
$BARBICAN_SERVICE \ internal "http://$SERVICE_HOST:9311"
internal "http://$SERVICE_HOST:9311"
fi
} }