add retry when rabbitmq join failed

JIRA: COMPASS-206

Change-Id: I0cf7b2dd1414f3270ff894a6cf17aba5841e6848
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml
index b06aac5..c01ad4f 100644 (file)
--- a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml
+++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml
@@ -5,5 +5,7 @@
 - name: sync cinder db
   #cinder_manage: action=dbsync
   shell: su -s /bin/sh -c 'cinder-manage db sync' cinder
+  ignore_errors: true
+  changed_when: true
   notify:
     - restart cinder control serveice

diff --git a/deploy/adapters/ansible/roles/database/tasks/main.yml b/deploy/adapters/ansible/roles/database/tasks/main.yml
index f380f60..20b6fe4 100644 (file)
--- a/deploy/adapters/ansible/roles/database/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/database/tasks/main.yml
@@ -3,6 +3,7 @@
 
 - include: mariadb_install.yml
 - include: mariadb_cluster.yml
+  when: '{{ haproxy_hosts|length }} > 1'
 
 - include: mariadb_config.yml
   when:

diff --git a/deploy/adapters/ansible/roles/mq/tasks/rabbitmq_cluster.yml b/deploy/adapters/ansible/roles/mq/tasks/rabbitmq_cluster.yml
index 8b0ce9a..0cae529 100644 (file)
--- a/deploy/adapters/ansible/roles/mq/tasks/rabbitmq_cluster.yml
+++ b/deploy/adapters/ansible/roles/mq/tasks/rabbitmq_cluster.yml
@@ -2,8 +2,12 @@
 - name: stop rabbitmq app
   shell: rabbitmqctl stop_app; sleep 3
 
-- name: join  cluster
-  command: rabbitmqctl join_cluster rabbit@{{ haproxy_hosts.keys()[0] }}
+- name: join cluster
+  shell: rabbitmqctl join_cluster rabbit@{{ haproxy_hosts.keys()[0] }}
+  register: join_result
+  until: join_result|success
+  retries: 20
+  delay: 3
 
 - name: start rabbitmq app
-  command: rabbitmqctl start_app
+  shell: rabbitmqctl start_app