aboutsummaryrefslogtreecommitdiff
path: root/docker/common/nova/nova-api
diff options
context:
space:
mode:
authorSwapnil Kulkarni <me@coolsvap.net>2015-07-20 11:05:18 +0000
committerSwapnil Kulkarni <me@coolsvap.net>2015-07-29 18:08:50 +0000
commit1c147e4def0605e64a41916b71a9f2e675a0cbcf (patch)
tree11ec1e7ffbc134ee5c9feed4cecfaca0588a2acc /docker/common/nova/nova-api
parent9f3b2ddf173bcab10cf6516702fce690c11431cf (diff)
downloadkolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.tar.gz
kolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.zip
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
Diffstat (limited to 'docker/common/nova/nova-api')
-rwxr-xr-xdocker/common/nova/nova-api/config-internal.sh13
1 files changed, 9 insertions, 4 deletions
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