aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-24 22:09:44 +0000
committerGerrit Code Review <review@openstack.org>2016-02-24 22:09:44 +0000
commit1a9631a30e8a32fa9e287f3c0edc57163d2b0f26 (patch)
tree326979e87e4b48152359d808f61f84dbb00d1099
parentfb5773f1000b5552888ab723843247b8a68dda57 (diff)
parente62995055f7bdf13add8067f374e8d83f4475bc9 (diff)
downloadkolla-1a9631a30e8a32fa9e287f3c0edc57163d2b0f26.tar.gz
kolla-1a9631a30e8a32fa9e287f3c0edc57163d2b0f26.zip
Merge "Ensuring the Mariadb bootstrap configured properly"
-rw-r--r--ansible/roles/mariadb/tasks/bootstrap.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml
index 3180a33f9..f6a184261 100644
--- a/ansible/roles/mariadb/tasks/bootstrap.yml
+++ b/ansible/roles/mariadb/tasks/bootstrap.yml
@@ -57,7 +57,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'
@@ -66,3 +66,6 @@
changed_when: False
retries: 6
delay: 10
+ with_items:
+ - cluster.exists
+ - mariadb.pid