aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-16 15:18:25 +0000
committerGerrit Code Review <review@openstack.org>2016-02-16 15:18:25 +0000
commitacec1c824898e5d7a8487dd9d38e3a7f93a13a6a (patch)
tree15c34e7002a889a1a1b2945d3f444af21f9916eb
parent18ab9adb56d5db6e696d2e50a57c053dfad877e0 (diff)
parentbf6b75da3f5ac928c2ff14e5585c6b2574155381 (diff)
downloadkolla-acec1c824898e5d7a8487dd9d38e3a7f93a13a6a.tar.gz
kolla-acec1c824898e5d7a8487dd9d38e3a7f93a13a6a.zip
Merge "Make a final check to validate mysql works"
-rw-r--r--ansible/roles/mariadb/tasks/check.yml8
-rw-r--r--ansible/roles/mariadb/tasks/deploy.yml3
2 files changed, 11 insertions, 0 deletions
diff --git a/ansible/roles/mariadb/tasks/check.yml b/ansible/roles/mariadb/tasks/check.yml
new file mode 100644
index 000000000..80a4e5240
--- /dev/null
+++ b/ansible/roles/mariadb/tasks/check.yml
@@ -0,0 +1,8 @@
+---
+- name: Waiting for MariaDB service to be ready through VIP
+ command: "docker exec mariadb mysql -h {{ kolla_internal_address }} -u haproxy -e 'show databases;'"
+ register: result
+ until: result | success
+ changed_when: False
+ retries: 6
+ delay: 10
diff --git a/ansible/roles/mariadb/tasks/deploy.yml b/ansible/roles/mariadb/tasks/deploy.yml
index c13e4eb0a..93f19edce 100644
--- a/ansible/roles/mariadb/tasks/deploy.yml
+++ b/ansible/roles/mariadb/tasks/deploy.yml
@@ -18,3 +18,6 @@
# Since the last start.yml may have recreated some containers we must wait and
# check the health again to ensure the hosts are active.
- include: register.yml
+
+# Test haproxy user through VIP
+- include: check.yml