diff options
| author | Martin André <martin.andre@kvhasia.com> | 2015-03-19 14:48:27 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-03-21 11:11:57 +0900 |
| commit | 448e48a75b97cd22e977413c78d85c311c037617 (patch) | |
| tree | aa03d07cb04556b7bc218cb0864715042020949a | |
| parent | 3f4c45fac55690e62d0ecfa4bdf47ee59912459b (diff) | |
| download | kolla-448e48a75b97cd22e977413c78d85c311c037617.tar.gz kolla-448e48a75b97cd22e977413c78d85c311c037617.zip | |
Cleanup leftovers after wait_for was merged into kolla-common.sh
Change-Id: I97ab671bfbdcf5434feedec617a938b30af4579b
| -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 |