Merge "Do not set os_aut_url for ceilometer"

This commit is contained in:
Jenkins 2013-07-31 14:48:28 +00:00 committed by Gerrit Code Review
commit 549f1a8fc3

View File

@ -81,7 +81,6 @@ function configure_ceilometer() {
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