openstack
/
cloudkitty
Code Issues Proposed changes

Fix devstack plugin compatibility 

'KEYSTONE_CATALOG_BACKEND' was removed recently [1],
so delete the reference in CloudKitty as it was done
in devstack [2].

[1] https://review.openstack.org/#/c/391380/
[2] https://review.openstack.org/#/c/278333/

Change-Id: Ie6dbcc5a2a1e2958a9a3fa9e9f40f71ad57b5ebb
Closes-Bug: #1644194
This commit is contained in:
Jeremy Liu 2016-11-23 21:06:17 +08:00
parent 994c6f7951
commit 85920c9626
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devstack/plugin.sh
View File

@ -48,15 +48,13 @@ fi
function create_cloudkitty_accounts {
create_service_user "cloudkitty"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
local cloudkitty_service=$(get_or_create_service "cloudkitty" \
"rating" "OpenStack Rating")
get_or_create_endpoint $cloudkitty_service \
"$REGION_NAME" \
"$CLOUDKITTY_SERVICE_PROTOCOL://$CLOUDKITTY_SERVICE_HOSTPORT/" \
"$CLOUDKITTY_SERVICE_PROTOCOL://$CLOUDKITTY_SERVICE_HOSTPORT/" \
"$CLOUDKITTY_SERVICE_PROTOCOL://$CLOUDKITTY_SERVICE_HOSTPORT/"
fi
local cloudkitty_service=$(get_or_create_service "cloudkitty" \
"rating" "OpenStack Rating")
get_or_create_endpoint $cloudkitty_service \
"$REGION_NAME" \
"$CLOUDKITTY_SERVICE_PROTOCOL://$CLOUDKITTY_SERVICE_HOSTPORT/" \
"$CLOUDKITTY_SERVICE_PROTOCOL://$CLOUDKITTY_SERVICE_HOSTPORT/" \
"$CLOUDKITTY_SERVICE_PROTOCOL://$CLOUDKITTY_SERVICE_HOSTPORT/"
# Create the rating role
get_or_create_role "rating"