aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Fazekas <afazekas@redhat.com>2014-02-02 09:38:05 +0100
committerAttila Fazekas <afazekas@redhat.com>2014-02-02 09:38:05 +0100
commit2ed4ae70b820ad3cbd12f2b6c2452ff66005ebaa (patch)
tree09a1a591e15a1f6f8ef894a74d5dda2249206842
parent78ab80e5589a7df21a03f06f38c4bae3e79bf756 (diff)
Have ceilometer to respect the keystone settings
lib/ceilometer ignored the global settings related to keystone settings. It can cause issues for example when the keystone does not listen on 127.0.0.1 even in single node deployment. Change-Id: I6e4654daa2ec624ac11aaf7f49495fcfaa72071d
-rw-r--r--lib/ceilometer4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ceilometer b/lib/ceilometer
index 30bf3ae..75c00b6 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -137,7 +137,9 @@ function configure_ceilometer() {
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