aboutsummaryrefslogtreecommitdiff
path: root/docker/common/barbican
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/barbican
parent15eb390ab307885943280a4b5d1287dc580517aa (diff)
parent1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff)
downloadkolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz
kolla-731d5205cbed74028bda0883a5432afc476605b6.zip
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/barbican')
-rwxr-xr-xdocker/common/barbican/config-internal.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/common/barbican/config-internal.sh b/docker/common/barbican/config-internal.sh
index 1ca4bd1be..da5f306a2 100755
--- a/docker/common/barbican/config-internal.sh
+++ b/docker/common/barbican/config-internal.sh
@@ -7,8 +7,10 @@ if ! [ "$BARBICAN_DB_PASSWORD" ]; then
export BARBICAN_DB_PASSWORD
fi
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
- KEYSTONE_ADMIN_SERVICE_PORT BARBICAN_ADMIN_PASSWORD
+check_required_vars BARBICAN_ADMIN_PASSWORD \
+ KEYSTONE_ADMIN_SERVICE_HOST \
+ KEYSTONE_ADMIN_SERVICE_PORT \
+ KEYSTONE_ADMIN_TOKEN
fail_unless_db
fail_unless_os_service_running keystone