Browse code
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
ZhiQiang Fan authored on 2014/04/16 15:52:12Showing 1 changed files
| ... | ... |
@@ -155,10 +155,11 @@ function configure_ceilometer {
|
| 155 | 155 |
fi |
| 156 | 156 |
|
| 157 | 157 |
# the compute and central agents need these credentials in order to |
| 158 |
- # call out to the public nova and glance APIs |
|
| 159 |
- iniset $CEILOMETER_CONF DEFAULT os_username ceilometer |
|
| 160 |
- iniset $CEILOMETER_CONF DEFAULT os_password $SERVICE_PASSWORD |
|
| 161 |
- iniset $CEILOMETER_CONF DEFAULT os_tenant_name $SERVICE_TENANT_NAME |
|
| 158 |
+ # call out to other services' public APIs |
|
| 159 |
+ # the alarm evaluator needs these options to call ceilometer APIs |
|
| 160 |
+ iniset $CEILOMETER_CONF service_credentials os_username ceilometer |
|
| 161 |
+ iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD |
|
| 162 |
+ iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME |
|
| 162 | 163 |
|
| 163 | 164 |
iniset $CEILOMETER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
| 164 | 165 |
iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |