commit 9d57dc8b04d85bb996bace16a0a5f82a21dd5ebb
author Jenkins <jenkins@review.openstack.org> Wed May 21 10:30:45 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 21 10:30:45 2014 +0000
tree d50c18af8ef80d58c94c61f03971fca7146a6a12
parent 740822b18b4d9ab996bb8413e47eddb8c009a15e
parent 4c11089739e6d32b77aea0c8fd2dd3d79570b1c8

Merge "ceilometer.conf configuration option missing os_auth_url"

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index a4be7af..d4deb10 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -163,6 +163,7 @@
     iniset $CEILOMETER_CONF service_credentials os_username ceilometer
     iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD
     iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME
+    iniset $CEILOMETER_CONF service_credentials os_auth_url $OS_AUTH_URL
 
     iniset $CEILOMETER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
     iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT