diff options
| author | Martin André <martin.andre@kvhasia.com> | 2014-12-01 14:50:58 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-01-19 16:29:59 +0900 |
| commit | 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (patch) | |
| tree | ba76b5a063dac400dcb6ab5cb0654b808fbf8e0b /docker/barbican | |
| parent | 9723a796d3ccdf3d898ae0612f48a4ec1fa91d4f (diff) | |
| download | kolla-91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9.tar.gz kolla-91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9.zip | |
Cleanup required variables checks for all containers
This allows Kubernetes to reschedule containers in case a required
variable is missing, for example when the Kubernetes pod is started
before the service.
The checks were cleaned using the following method:
* remove duplicates
* remove check for variables that get a default value in the same file
* check for all variables used in the file
* check for required services when it is obvious.
Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
Diffstat (limited to 'docker/barbican')
| -rwxr-xr-x | docker/barbican/start.sh | 15 |
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 |