aboutsummaryrefslogtreecommitdiff
path: root/docker/common/cinder-app/cinder-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-30 18:54:43 +0000
committerGerrit Code Review <review@openstack.org>2015-07-30 18:54:43 +0000
commit731d5205cbed74028bda0883a5432afc476605b6 (patch)
tree38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/cinder-app/cinder-api
parent15eb390ab307885943280a4b5d1287dc580517aa (diff)
parent1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff)
downloadkolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz
kolla-731d5205cbed74028bda0883a5432afc476605b6.zip
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/cinder-app/cinder-api')
-rwxr-xr-xdocker/common/cinder-app/cinder-api/config-internal.sh16
1 files changed, 11 insertions, 5 deletions
diff --git a/docker/common/cinder-app/cinder-api/config-internal.sh b/docker/common/cinder-app/cinder-api/config-internal.sh
index 832d4f78a..158d1efe1 100755
--- a/docker/common/cinder-app/cinder-api/config-internal.sh
+++ b/docker/common/cinder-app/cinder-api/config-internal.sh
@@ -4,11 +4,17 @@ set -e
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-cinder.sh
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
- ADMIN_TENANT_NAME PUBLIC_IP CINDER_API_SERVICE_HOST \
- KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_PORT \
- CINDER_KEYSTONE_USER CINDER_KEYSTONE_PASSWORD \
- CINDER_API_SERVICE_LISTEN CINDER_API_SERVICE_PORT
+check_required_vars ADMIN_TENANT_NAME \
+ CINDER_API_SERVICE_HOST \
+ CINDER_API_SERVICE_LISTEN \
+ CINDER_API_SERVICE_PORT \
+ CINDER_KEYSTONE_PASSWORD \
+ CINDER_KEYSTONE_USER \
+ KEYSTONE_ADMIN_SERVICE_HOST \
+ KEYSTONE_ADMIN_SERVICE_PORT \
+ KEYSTONE_AUTH_PROTOCOL \
+ KEYSTONE_ADMIN_TOKEN \
+ PUBLIC_IP
fail_unless_os_service_running keystone