diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 18:54:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 18:54:43 +0000 |
| commit | 731d5205cbed74028bda0883a5432afc476605b6 (patch) | |
| tree | 38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/nova/nova-api | |
| parent | 15eb390ab307885943280a4b5d1287dc580517aa (diff) | |
| parent | 1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff) | |
| download | kolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz kolla-731d5205cbed74028bda0883a5432afc476605b6.zip | |
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/nova/nova-api')
| -rwxr-xr-x | docker/common/nova/nova-api/config-internal.sh | 13 |
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 |