openstack
/
panko
Code Issues Proposed changes

KEYSTONE_CATALOG_BACKEND is deprecated 

this removes it
see: http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.htm

Change-Id: Ic1ba628e00db114b4e2b219d094ab7db7e6e622b
This commit is contained in:
gordon chung 2016-02-10 17:31:26 -05:00
parent 57a16b4571
commit 7b23b3f185
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/plugin.sh
View File

@ -166,14 +166,13 @@ function _ceilometer_create_accounts {
create_service_user "ceilometer" "admin"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
get_or_create_service "ceilometer" "metering" "OpenStack Telemetry Service"
get_or_create_endpoint "metering" \
"$REGION_NAME" \
"$(ceilometer_service_url)" \
"$(ceilometer_service_url)" \
"$(ceilometer_service_url)"
fi
get_or_create_service "ceilometer" "metering" "OpenStack Telemetry Service"
get_or_create_endpoint "metering" \
"$REGION_NAME" \
"$(ceilometer_service_url)" \
"$(ceilometer_service_url)" \
"$(ceilometer_service_url)"
if is_service_enabled swift; then
# Ceilometer needs ResellerAdmin role to access Swift account stats.
get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_TENANT_NAME