aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-06 19:08:46 +0000
committerGerrit Code Review <review@openstack.org>2015-02-06 19:08:46 +0000
commit26b564dd06890862e268ea72b987bcb5ebf4bdb2 (patch)
tree726b9e932f6e5e711583bf9556100d4a5ad15e7d /docker/barbican
parente91aafc75a656f108f97d6adb69fe132923b9119 (diff)
parent91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (diff)
downloadkolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.tar.gz
kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.zip
Merge "Cleanup required variables checks for all containers"
Diffstat (limited to 'docker/barbican')
-rwxr-xr-xdocker/barbican/start.sh15
1 files changed, 5 insertions, 10 deletions
diff --git a/docker/barbican/start.sh b/docker/barbican/start.sh
index 676374faa..c90f66c47 100755
--- a/docker/barbican/start.sh
+++ b/docker/barbican/start.sh
@@ -8,21 +8,16 @@ set -e
: ${BARBICAN_KEYSTONE_USER:=barbican}
: ${ADMIN_TENANT_NAME:=admin}
-if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
- echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2
- exit 1
-fi
-
-if ! [ "$DB_ROOT_PASSWORD" ]; then
- echo "*** Missing DB_ROOT_PASSWORD" >&2
- exit 1
-fi
-
if ! [ "$BARBICAN_DB_PASSWORD" ]; then
BARBICAN_DB_PASSWORD=$(openssl rand -hex 15)
export BARBICAN_DB_PASSWORD
fi
+check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
+ KEYSTONE_ADMIN_SERVICE_PORT BARBICAN_ADMIN_PASSWORD
+check_for_db
+check_for_keystone
+
mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${BARBICAN_DB_NAME};
GRANT ALL PRIVILEGES ON barbican.* TO