commit eccd8952f7f0e8b4fba6bdbcba84b85b343529ea
author Jenkins <jenkins@review.openstack.org> Thu May 22 18:09:12 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu May 22 18:09:12 2014 +0000
tree 810b0fe4cb8f3b4d994bad3cfb924ce88a51a6b8
parent 2109d74db5df2c8858ca51f48f1bffbc9df89041
parent d24afa190c4f1b51dc4c281d0a79cc9483e8b272

Merge "Revert "ceilometer.conf configuration option missing os_auth_url""

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index d4deb10..a4be7af 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -163,7 +163,6 @@
     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