aboutsummaryrefslogtreecommitdiff
path: root/docker/glance
diff options
context:
space:
mode:
authorMartin André <martin.andre@kvhasia.com>2014-12-01 14:50:58 +0900
committerMartin André <martin.andre@kvhasia.com>2015-01-19 16:29:59 +0900
commit91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (patch)
treeba76b5a063dac400dcb6ab5cb0654b808fbf8e0b /docker/glance
parent9723a796d3ccdf3d898ae0612f48a4ec1fa91d4f (diff)
downloadkolla-91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9.tar.gz
kolla-91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9.zip
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
Diffstat (limited to 'docker/glance')
-rw-r--r--docker/glance/glance-base/config-glance.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh
index a6380e5c8..2a6e54caa 100644
--- a/docker/glance/glance-base/config-glance.sh
+++ b/docker/glance/glance-base/config-glance.sh
@@ -11,7 +11,9 @@ set -e
: ${KEYSTONE_AUTH_PROTOCOL:=http}
: ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR}
-check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD
+check_for_db
+check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD \
+ KEYSTONE_PUBLIC_SERVICE_HOST
dump_vars
cat > /openrc <<EOF