From 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 Mon Sep 17 00:00:00 2001 From: Martin André 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/nova-base/config-nova.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docker/nova-base') diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 15ab7870c..10aa646fa 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -11,8 +11,10 @@ : ${RABBIT_PASSWORD:=guest} : ${NETWORK_MANAGER:=nova} -check_required_vars KEYSTONE_ADMIN_TOKEN \ - NOVA_DB_PASSWORD +check_for_db +check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ + RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ + KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP cfg=/etc/nova/nova.conf @@ -75,6 +77,7 @@ if [ "${NETWORK_MANAGER}" == "nova" ] ; then crudini --set $cfg DEFAULT flat_network_bridge br100 crudini --set $cfg DEFAULT public_interface eth1 elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then + check_required_vars NEUTRON_SHARED_SECRET crudini --set $cfg DEFAULT service_neutron_metadata_proxy True crudini --set $cfg DEFAULT neutron_metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET} crudini --set $cfg DEFAULT neutron_default_tenant_id default -- cgit v1.2.3