openstack
/
panko
Code Issues Proposed changes

Sync devstack plugin with devstack:lib/ceilometer 

While the removal of ceilometer from core devstack is still pending
we need to make sure that change in lib/ceilometer are reflected in
the plugin. This synchronizes the small number of recent changes.
We're nearly there on the extractions so there shouldn't be too much
more of this.

Change-Id: I8c99d57ba5183d3c63b4814ca0664d5bf3420832
This commit is contained in:
Chris Dent 2015-08-06 09:27:32 +00:00
parent 49f53f35a5
commit 7b2376068f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -155,7 +155,7 @@ function _ceilometer_prepare_virt_drivers {
fi
if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
pip_instal_gr oslo.vmware
pip_install_gr oslo.vmware
fi
fi
}
@ -168,9 +168,8 @@ function _ceilometer_create_accounts {
create_service_user "ceilometer" "admin"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
local ceilometer_service=$(get_or_create_service "ceilometer" \
"metering" "OpenStack Telemetry Service")
get_or_create_endpoint $ceilometer_service \
get_or_create_service "ceilometer" "metering" "OpenStack Telemetry Service"
get_or_create_endpoint "metering" \
"$REGION_NAME" \
"$(ceilometer_service_url)/" \
"$(ceilometer_service_url)/" \