From 1af4afb004df05a03d8d70cb8829123da48f4bb1 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Wed, 16 Apr 2014 14:52:12 +0800 Subject: [PATCH] Replace DEFAULT section with service_credentials Some options defined in ceilometer.service should be in service_credentials section instead of DEFAULT, which is deprecated since Havana. Change-Id: I69077394a77f379db2be593a9fa15d414015610a --- lib/ceilometer | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ceilometer b/lib/ceilometer index 5030b3cb35..5476773f5a 100644 --- a/lib/ceilometer +++ b/lib/ceilometer @@ -155,10 +155,11 @@ function configure_ceilometer { fi # the compute and central agents need these credentials in order to - # call out to the public nova and glance APIs - 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 + # call out to other services' public APIs + # the alarm evaluator needs these options to call ceilometer APIs + 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 keystone_authtoken auth_host $KEYSTONE_AUTH_HOST iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT