openstack/devstack
Code Issues Proposed changes

Merge "Replace DEFAULT section with service_credentials"

Browse Source
This commit is contained in:
Jenkins 2014-04-26 05:32:08 +00:00 committed by Gerrit Code Review
commit b61fc03102
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ceilometer
View File

@ -155,10 +155,11 @@ function configure_ceilometer {
fi fi
# the compute and central agents need these credentials in order to # the compute and central agents need these credentials in order to
# call out to the public nova and glance APIs # call out to other services' public APIs
iniset $CEILOMETER_CONF DEFAULT os_username ceilometer # the alarm evaluator needs these options to call ceilometer APIs
iniset $CEILOMETER_CONF DEFAULT os_password $SERVICE_PASSWORD iniset $CEILOMETER_CONF service_credentials os_username ceilometer
iniset $CEILOMETER_CONF DEFAULT os_tenant_name $SERVICE_TENANT_NAME 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_host $KEYSTONE_AUTH_HOST
iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT