Change waiting on mariadb.pid

Previously the code looked at mariadb.pid, but this seemed
flakey in function.  It seemed racey and prone to failure on
slower connections to a registry.  The original task was
extremely complex and it didnt really verify that the MariaDB
was ready to serve connections.  Use wait_for with a regex
instead.

Change-Id: I3aafac04f03639b08e0ef4d6a9c9e1a4499f000c
Closes-Bug: #1564278
(cherry picked from commit ba4bcdbbe8)
This commit is contained in:
Steven Dake 2016-04-05 11:32:20 -04:00
parent 7c0219e9ba
commit 967d845bdf
1 changed files with 6 additions and 9 deletions

View File

@ -14,12 +14,9 @@
( delegate_host == 'None' and inventory_hostname != groups['mariadb'][0] )
- name: Waiting for MariaDB service to be ready
command: "docker exec mariadb ls /var/lib/mysql/mariadb.pid"
register: bootstrap_result
when: delegate_host != 'None' or
( groups['mariadb'] | length ) == 1 or
( delegate_host == 'None' and inventory_hostname != groups['mariadb'][0] )
until: bootstrap_result|success
changed_when: False
retries: 6
delay: 10
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ mariadb_port }}"
connect_timeout: 1
timeout: 60
search_regex: "MariaDB"