diff options
| author | Steven Dake <sdake@redhat.com> | 2014-10-02 12:43:47 -0700 |
|---|---|---|
| committer | Steven Dake <sdake@redhat.com> | 2014-10-02 12:43:47 -0700 |
| commit | d94115c342bfd01797241a385dd4c8d1ea1e0b0e (patch) | |
| tree | 82bcaf51d82d7b87c88d0bdc2ee24f319326917d /docker/keystone | |
| parent | 30739441890f87cc74d21eb503921c3e1fec0816 (diff) | |
| download | kolla-d94115c342bfd01797241a385dd4c8d1ea1e0b0e.tar.gz kolla-d94115c342bfd01797241a385dd4c8d1ea1e0b0e.zip | |
Restart container until mariadb is available
Fix a race condition between MariaDB service start and Keystone.
Change-Id: I31384204eca9c7201eb102ec0359b390e88b96ba
Diffstat (limited to 'docker/keystone')
| -rwxr-xr-x | docker/keystone/start.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index b282e42e6..aec2d7253 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -1,5 +1,10 @@ #!/bin/bash +# Exit the container if MariaDB is not yet up - then depend on kube to restart +if [ -z "$MARIADBMASTER_PORT_3306_TCP_PORT" ]; then + exit 1 +fi + : ${KEYSTONE_ADMIN_PASSWORD:=kolla} : ${ADMIN_TENANT_NAME:=admin} |