commit b17ad7560d7d67e3464b489e124c540e025b9299
author Jamie Lennox <jamielennox@redhat.com> Fri May 29 06:04:47 2015 +0000
committer Jamie Lennox <jamielennox@redhat.com> Wed Jul 08 05:17:00 2015 +1000
tree 4af18b24b59bded064806f15b0f2c8b69e7d9183
parent 68f9172dbd18688db188454c775dbf139224aeca

Use identity V3 API for endpoint creation

Always use the keystone V3 API when creating services and endpoints. The syntax
here is slightly different but we maintain the function interface.

Change-Id: Ib3a375918a45fd6e37d873a1a5c0c4b26bdbb5d8
Implements: bp keystonev3

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 163ed0b..7905384 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -130,9 +130,8 @@
         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_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/" \
                 "$CEILOMETER_SERVICE_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/" \