aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
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