From 448e48a75b97cd22e977413c78d85c311c037617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <martin.andre@kvhasia.com>
Date: Thu, 19 Mar 2015 14:48:27 +0900
Subject: [PATCH] Cleanup leftovers after wait_for was merged into
kolla-common.sh
Change-Id: I97ab671bfbdcf5434feedec617a938b30af4579b
---
docker/centos-rdo-base/Dockerfile | 1 -
docker/glance/glance-registry/start.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile
index b613033ea0..a0ce5248bb 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 865e60b87d..c4658d6379 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
--
GitLab