Skip to content
Snippets Groups Projects
Commit 448e48a7 authored by Martin André's avatar Martin André
Browse files

Cleanup leftovers after wait_for was merged into kolla-common.sh 

Change-Id: I97ab671bfbdcf5434feedec617a938b30af4579b
parent 3f4c45fa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docker/centos-rdo-base/Dockerfile
+ 0
− 1
View file @ 448e48a7
...@@ -95,4 +95,3 @@ RUN yum install -y \ ...@@ -95,4 +95,3 @@ RUN yum install -y \
RUN mkdir -p /opt/kolla RUN mkdir -p /opt/kolla
ADD service_hosts.sh /opt/kolla/service_hosts.sh ADD service_hosts.sh /opt/kolla/service_hosts.sh
ADD kolla-common.sh /opt/kolla/kolla-common.sh ADD kolla-common.sh /opt/kolla/kolla-common.sh
ADD wait_for /opt/kolla/wait_for
docker/glance/glance-registry/start.sh
+ 1
− 1
View file @ 448e48a7
...@@ -7,7 +7,7 @@ set -e ...@@ -7,7 +7,7 @@ set -e
check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD
# lets wait for the DB to be available # 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 check_for_db
mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment