commit 549f1a8fc328c2aa8884721243b1fd1ddf1004bd
author Jenkins <jenkins@review.openstack.org> Wed Jul 31 14:48:28 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 31 14:48:28 2013 +0000
tree 3a04273c9067707277399698696fef721175be22
parent c31d192262127f2a1a57e1e4aa05e87eee56e6bb
parent 73bd1233a72ea074cced809af31c113cc3c63af0

Merge "Do not set os_aut_url for ceilometer"

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 548496e..15eb6a6 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -81,7 +81,6 @@
     iniset $CEILOMETER_CONF DEFAULT os_username ceilometer
     iniset $CEILOMETER_CONF DEFAULT os_password $SERVICE_PASSWORD
     iniset $CEILOMETER_CONF DEFAULT os_tenant_name $SERVICE_TENANT_NAME
-    iniset $CEILOMETER_CONF DEFAULT os_auth_url $OS_AUTH_URL
 
     iniset $CEILOMETER_CONF keystone_authtoken auth_protocol http
     iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer