From bfa5d0a2ec8599be983d11acc09e326f5b84263d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <martin.andre@kvhasia.com>
Date: Tue, 2 Dec 2014 16:17:54 +0900
Subject: [PATCH] Fix use of undefined KEYSTONE_SERVICE_HOST in Ceilometer

This variable is never defined anywhere, and it is not one of the
variable automatically exported by k8s or docker.
It should be KEYSTONE_PUBLIC_SERVICE_HOST instead.

Change-Id: Ib65b0189d0a767212fbb7eff4ce81717d492c3e2
---
 docker/ceilometer/ceilometer-base/config-ceilometer.sh | 6 +++---
 docker/ceilometer/ceilometer-compute/start.sh          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh
index 64008ab8ba..87dcac6538 100644
--- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh
+++ b/docker/ceilometer/ceilometer-base/config-ceilometer.sh
@@ -25,14 +25,14 @@ cfg=/etc/ceilometer/ceilometer.conf
 crudini --set $cfg \
     DEFAULT rpc_backend rabbit
 crudini --set $cfg \
-    DEFAULT rabbit_host ${KEYSTONE_SERVICE_HOST}
+    DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST}
 crudini --set $cfg \
     DEFAULT rabbit_password ${RABBITMQ_PASS}
 
 crudini --set $cfg \
     keystone_authtoken \
     auth_uri \
-    "http://${KEYSTONE_SERVICE_HOST}:5000/"
+    "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/"
 crudini --set $cfg \
     keystone_authtoken \
     admin_tenant_name \
@@ -49,7 +49,7 @@ crudini --set $cfg \
 crudini --set $cfg \
     service_credentials \
     os_auth_url \
-    ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:5000/
+    ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/
 crudini --set $cfg \
     service_credentials \
     os_username \
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh
index 3e3c6c82a9..d9b62be823 100644
--- a/docker/ceilometer/ceilometer-compute/start.sh
+++ b/docker/ceilometer/ceilometer-compute/start.sh
@@ -4,7 +4,7 @@
 . /opt/kolla/config-ceilometer.sh
 
 
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME
+check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME
 
 check_for_keystone
 
@@ -18,7 +18,7 @@ crudini --set /etc/nova/nova.conf DEFAULT notification_driver ceilometer.compute
 #ceilometer settings
 cfg=/etc/ceilometer/ceilometer.conf
 crudini --set $cfg publisher_rpc metering_secret ${KEYSTONE_ADMIN_TOKEN}
-crudini --set $cfg rabbit_host ${KEYSTONE_SERVICE_HOST}
+crudini --set $cfg rabbit_host ${RABBITMQ_SERVICE_HOST}
 crudini --set $cfg rabbit_password ${RABBITMQ_PASS}