openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-03-21 03:07:48 +00:00 committed by Gerrit Code Review
commit b6d4cf6310
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/centos-rdo-base/Dockerfile
View File

@ -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

2
docker/glance/glance-registry/start.sh
View File

@ -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