commit f5cfa1eccd03b1562d2ed65f52ee16979782b113
author Jenkins <jenkins@review.openstack.org> Mon Feb 03 18:51:22 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 03 18:51:22 2014 +0000
tree 20dea77d877ec0caaa73a8a3d28c2d65b18cabf2
parent 8664ca53f80849553043aba9663f7cb72a9cec42
parent 2ed4ae70b820ad3cbd12f2b6c2452ff66005ebaa

Merge "Have ceilometer to respect the keystone settings"

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 6a72459..f9c7691 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -138,7 +138,9 @@
     iniset $CEILOMETER_CONF DEFAULT os_password $SERVICE_PASSWORD
     iniset $CEILOMETER_CONF DEFAULT os_tenant_name $SERVICE_TENANT_NAME
 
-    iniset $CEILOMETER_CONF keystone_authtoken auth_protocol http
+    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_protocol $KEYSTONE_AUTH_PROTOCOL
     iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer
     iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
     iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME