diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-21 03:07:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-21 03:07:48 +0000 |
| commit | b6d4cf6310f50fb009fdc832b3ac49ff60138185 (patch) | |
| tree | 8c8f0d97a977c8d2772a37d7b9e038cb781629e5 /docker | |
| parent | 1854cb52e95433a3068a2df813c901c5a1d70eb9 (diff) | |
| parent | 448e48a75b97cd22e977413c78d85c311c037617 (diff) | |
| download | kolla-b6d4cf6310f50fb009fdc832b3ac49ff60138185.tar.gz kolla-b6d4cf6310f50fb009fdc832b3ac49ff60138185.zip | |
Merge "Cleanup leftovers after wait_for was merged into kolla-common.sh"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos-rdo-base/Dockerfile | 1 | ||||
| -rwxr-xr-x | docker/glance/glance-registry/start.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index b613033ea..a0ce5248b 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -95,4 +95,3 @@ RUN yum install -y \ RUN mkdir -p /opt/kolla ADD service_hosts.sh /opt/kolla/service_hosts.sh ADD kolla-common.sh /opt/kolla/kolla-common.sh -ADD wait_for /opt/kolla/wait_for diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 865e60b87..c4658d637 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -7,7 +7,7 @@ set -e check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD # lets wait for the DB to be available -./opt/kolla/wait_for 25 1 mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" -e 'status;' +wait_for 25 1 mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" -e 'status;' check_for_db mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF |