From e62995055f7bdf13add8067f374e8d83f4475bc9 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Sat, 13 Feb 2016 22:10:51 +0800
Subject: [PATCH] Ensuring the Mariadb bootstrap configured properly

Make sure extend_start.sh file run to completion

Change-Id: I45f6ab1c7d1b7a21ac92bb5f0e9d82a6c135cb5f
Closes-Bug: #1545287
---
 ansible/roles/mariadb/tasks/bootstrap.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml
index aef9392267..c0d38f874d 100644
--- a/ansible/roles/mariadb/tasks/bootstrap.yml
+++ b/ansible/roles/mariadb/tasks/bootstrap.yml
@@ -56,7 +56,7 @@
     - inventory_hostname == groups['mariadb'][0]
 
 - name: Waiting for MariaDB service to be ready
-  command: "docker exec mariadb ls /var/lib/mysql/mariadb.pid"
+  command: "docker exec mariadb ls /var/lib/mysql/{{ item }}"
   register: bootstrap_result
   when:
     - delegate_host == 'None'
@@ -65,3 +65,6 @@
   changed_when: False
   retries: 6
   delay: 10
+  with_items:
+    - cluster.exists
+    - mariadb.pid