From 1c147e4def0605e64a41916b71a9f2e675a0cbcf Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni Date: Mon, 20 Jul 2015 11:05:18 +0000 Subject: Update service helper scripts for variable changes - Updated the required variables to be sorted so that they are better visible one on each line - Removed variable defaults from each service scripts and added them to tools/genenv file which holds all default values Change-Id: Ia7b1b08ba3f963b46b81434ce84f476d56890a93 Closes-Bug: #1476494 Closes-Bug: #1467652 --- docker/common/nova/nova-api/config-internal.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docker/common/nova/nova-api') diff --git a/docker/common/nova/nova-api/config-internal.sh b/docker/common/nova/nova-api/config-internal.sh index 7928370a4..86768a60d 100755 --- a/docker/common/nova/nova-api/config-internal.sh +++ b/docker/common/nova/nova-api/config-internal.sh @@ -4,10 +4,15 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ - NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \ - ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \ - NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME +check_required_vars ADMIN_TENANT_NAME \ + KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ + NOVA_API_SERVICE_HOST \ + NOVA_DB_NAME \ + NOVA_EC2_API_SERVICE_HOST \ + NOVA_KEYSTONE_PASSWORD \ + NOVA_KEYSTONE_USER \ + PUBLIC_IP fail_unless_os_service_running keystone fail_unless_db $NOVA_DB_NAME -- cgit v1.2.3