From 29a9515365c4588c3bff2cb0535625c6da55f80e Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Wed, 24 Jun 2015 12:52:52 -0400
Subject: [PATCH] Add more checks to the glance containers

The glance containers need to check for more required variables
than they were originally.

Closes-bug: #1432336
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>

Change-Id: I8fc730580f09ed3d4c54b8e94d011f0f924cae3e
---
 docker/common/glance/glance-api/start.sh      | 11 +++++----
 .../glance/glance-base/config-glance.sh       |  6 ++++-
 docker/common/glance/glance-registry/start.sh |  6 +++--
 docs/minimal-environment-vars.md              | 24 ++++++++++++++-----
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/docker/common/glance/glance-api/start.sh b/docker/common/glance/glance-api/start.sh
index c546333f44..9140afbf19 100755
--- a/docker/common/glance/glance-api/start.sh
+++ b/docker/common/glance/glance-api/start.sh
@@ -4,12 +4,13 @@ set -e
 
 . /opt/kolla/kolla-common.sh
 . /opt/kolla/config-glance.sh
-: ${GLANCE_API_SERVICE_HOST:=$PUBLIC_IP}
 
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
-                    GLANCE_KEYSTONE_USER GLANCE_KEYSTONE_PASSWORD \
-                    ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \
-                    PUBLIC_IP
+check_required_vars ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \
+                    GLANCE_KEYSTONE_PASSWORD GLANCE_KEYSTONE_USER \
+                    GLANCE_REGISTRY_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_HOST \
+                    KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_ADMIN_TOKEN \
+                    KEYSTONE_AUTH_PROTOCOL PUBLIC_IP \
+                    RABBITMQ_SERVICE_HOST
 
 fail_unless_os_service_running keystone
 
diff --git a/docker/common/glance/glance-base/config-glance.sh b/docker/common/glance/glance-base/config-glance.sh
index 97d076c116..51bb56667d 100644
--- a/docker/common/glance/glance-base/config-glance.sh
+++ b/docker/common/glance/glance-base/config-glance.sh
@@ -11,7 +11,11 @@ set -e
 : ${KEYSTONE_AUTH_PROTOCOL:=http}
 : ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR}
 
-check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD
+
+check_required_vars ADMIN_TENANT_NAME GLANCE_DB_NAME GLANCE_DB_PASSWORD \
+                    GLANCE_DB_USER GLANCE_KEYSTONE_PASSWORD \
+                    GLANCE_KEYSTONE_USER KEYSTONE_PUBLIC_SERVICE_HOST \
+                    MARIADB_SERVICE_HOST
 dump_vars
 
 cat > /openrc <<EOF
diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh
index 6b12d8fee9..ec646eb70d 100755
--- a/docker/common/glance/glance-registry/start.sh
+++ b/docker/common/glance/glance-registry/start.sh
@@ -5,8 +5,10 @@ set -e
 . /opt/kolla/kolla-common.sh
 . /opt/kolla/config-glance.sh
 
-check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD \
-                    INIT_GLANCE_DB
+
+check_required_vars DB_ROOT_PASSWORD GLANCE_DB_NAME \
+                    GLANCE_DB_PASSWORD GLANCE_DB_USER \
+                    MARIADB_SERVICE_HOST
 # lets wait for the DB to be available
 wait_for 25 1 check_for_db
 
diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md
index 5d0e64d9b8..2ce6556fd7 100644
--- a/docs/minimal-environment-vars.md
+++ b/docs/minimal-environment-vars.md
@@ -208,25 +208,37 @@ In order for each service to function, there is a minimum set of required variab
 
 # Glance-api
 
-    KEYSTONE_ADMIN_TOKEN
-    KEYSTONE_ADMIN_SERVICE_HOST
-    GLANCE_KEYSTONE_USER
-    GLANCE_KEYSTONE_PASSWORD
     ADMIN_TENANT_NAME
     GLANCE_API_SERVICE_HOST
+    GLANCE_KEYSTONE_PASSWORD
+    GLANCE_KEYSTONE_USER
+    GLANCE_REGISTRY_SERVICE_HOST
+    KEYSTONE_ADMIN_SERVICE_HOST
+    KEYSTONE_ADMIN_SERVICE_PORT
+    KEYSTONE_ADMIN_TOKEN
+    KEYSTONE_AUTH_PROTOCOL
     PUBLIC_IP
+    RABBITMQ_SERVICE_HOST
 
 # Glance-base
 
+    ADMIN_TENANT_NAME
     GLANCE_DB_PASSWORD
+    GLANCE_DB_NAME
+    GLANCE_DB_PASSWORD
+    GLANCE_DB_USER
     GLANCE_KEYSTONE_PASSWORD
+    GLANCE_KEYSTONE_USER
+    KEYSTONE_PUBLIC_SERVICE_HOST
+    MARIADB_SERVICE_HOST
 
 # Glance-registry
 
+    DB_ROOT_PASSWORD
     GLANCE_DB_NAME
-    GLANCE_DB_USER
     GLANCE_DB_PASSWORD
-    INIT_GLANCE_DB
+    GLANCE_DB_USER
+    MARIADB_SERVICE_HOST
 
 # Hautoproxy