Browse code
Merge "Revert "ceilometer.conf configuration option missing os_auth_url""
Jenkins authored on 2014/05/23 03:09:12Showing 1 changed files
| ... | ... |
@@ -163,7 +163,6 @@ function configure_ceilometer {
|
| 163 | 163 |
iniset $CEILOMETER_CONF service_credentials os_username ceilometer |
| 164 | 164 |
iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD |
| 165 | 165 |
iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME |
| 166 |
- iniset $CEILOMETER_CONF service_credentials os_auth_url $OS_AUTH_URL |
|
| 167 | 166 |
|
| 168 | 167 |
iniset $CEILOMETER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
| 169 | 168 |
iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |