From 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 Mon Sep 17 00:00:00 2001
From: Martin André <martin.andre@kvhasia.com>
Date: Mon, 1 Dec 2014 14:50:58 +0900
Subject: Cleanup required variables checks for all containers

This allows Kubernetes to reschedule containers in case a required
variable is missing, for example when the Kubernetes pod is started
before the service.

The checks were cleaned using the following method:
  * remove duplicates
  * remove check for variables that get a default value in the same file
  * check for all variables used in the file
  * check for required services when it is obvious.

Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
---
 docker/ceilometer/ceilometer-api/start.sh              | 7 ++++++-
 docker/ceilometer/ceilometer-base/config-ceilometer.sh | 6 ++++--
 docker/ceilometer/ceilometer-central/start.sh          | 4 ++--
 docker/ceilometer/ceilometer-compute/start.sh          | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'docker/ceilometer')

diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh
index 8c9acef5f..1cd6d4c18 100644
--- a/docker/ceilometer/ceilometer-api/start.sh
+++ b/docker/ceilometer/ceilometer-api/start.sh
@@ -5,7 +5,12 @@ set -e
 . /opt/kolla/kolla-common.sh
 . /opt/kolla/config-ceilometer.sh
 
-check_required_vars CEILOMETER_DB_USER CEILOMETER_DB_NAME KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER CEILOMETER_ADMIN_PASSWORD ADMIN_TENANT_NAME METERING_SECRET CEILOMETER_API_SERVICE_HOST PUBLIC_IP
+check_required_vars CEILOMETER_DB_USER CEILOMETER_DB_NAME \
+                    CEILOMETER_DB_PASSWORD KEYSTONE_ADMIN_TOKEN \
+                    KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_HOST \
+                    KEYSTONE_ADMIN_SERVICE_PORT ADMIN_TENANT_NAME \
+                    CEILOMETER_KEYSTONE_USER CEILOMETER_ADMIN_PASSWORD \
+                    CEILOMETER_API_SERVICE_HOST PUBLIC_IP
 
 check_for_keystone
 check_for_db
diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh
index 87dcac653..9df45994a 100644
--- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh
+++ b/docker/ceilometer/ceilometer-base/config-ceilometer.sh
@@ -10,8 +10,10 @@ set -e
 : ${CEILOMETER_ADMIN_PASSWORD:=kolla}
 : ${ADMIN_TENANT_NAME:=admin}
 : ${METERING_SECRET:=ceilometer}
+: ${RABBIT_PASSWORD:=guest}
 
-check_required_vars CEILOMETER_DB_PASSWORD KEYSTONE_ADMIN_TOKEN DB_ROOT_PASSWORD
+check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
+                    KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_PUBLIC_SERVICE_HOST \
 dump_vars
 
 cat > /openrc <<EOF
@@ -27,7 +29,7 @@ crudini --set $cfg \
 crudini --set $cfg \
     DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST}
 crudini --set $cfg \
-    DEFAULT rabbit_password ${RABBITMQ_PASS}
+    DEFAULT rabbit_password ${RABBIT_PASSWORD}
 
 crudini --set $cfg \
     keystone_authtoken \
diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh
index a40a3dde0..ec9951c90 100644
--- a/docker/ceilometer/ceilometer-central/start.sh
+++ b/docker/ceilometer/ceilometer-central/start.sh
@@ -3,10 +3,10 @@
 . /opt/kolla/kolla-common.sh
 . /opt/kolla/config-ceilometer.sh
 
-check_required_vars KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER CEILOMETER_ADMIN_PASSWORD ADMIN_TENANT_NAME
+check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_AUTH_PROTOCOL \
+                    KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT
 
 check_for_keystone
-check_for_db
 
 export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
 export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh
index d9b62be82..5b610b28a 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 RABBITMQ_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME
+check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST RABBIT_PASSWORD
 
 check_for_keystone
 
@@ -19,7 +19,7 @@ crudini --set /etc/nova/nova.conf DEFAULT notification_driver ceilometer.compute
 cfg=/etc/ceilometer/ceilometer.conf
 crudini --set $cfg publisher_rpc metering_secret ${KEYSTONE_ADMIN_TOKEN}
 crudini --set $cfg rabbit_host ${RABBITMQ_SERVICE_HOST}
-crudini --set $cfg rabbit_password ${RABBITMQ_PASS}
+crudini --set $cfg rabbit_password ${RABBIT_PASSWORD}
 
 
 exec /usr/bin/ceilometer-agent-compute
-- 
cgit v1.2.3