Browse code
Merge "Have ceilometer to respect the keystone settings"
Jenkins authored on 2014/02/04 03:51:22Showing 1 changed files
| ... | ... |
@@ -138,7 +138,9 @@ function configure_ceilometer() {
|
| 138 | 138 |
iniset $CEILOMETER_CONF DEFAULT os_password $SERVICE_PASSWORD |
| 139 | 139 |
iniset $CEILOMETER_CONF DEFAULT os_tenant_name $SERVICE_TENANT_NAME |
| 140 | 140 |
|
| 141 |
- iniset $CEILOMETER_CONF keystone_authtoken auth_protocol http |
|
| 141 |
+ iniset $CEILOMETER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
|
| 142 |
+ iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |
|
| 143 |
+ iniset $CEILOMETER_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 142 | 144 |
iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer |
| 143 | 145 |
iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |
| 144 | 146 |
iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |