diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-12-24 08:57:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-24 08:57:32 +0000 |
| commit | dc9d4399c9e68b8fc873387e4d4bc3499e21e304 (patch) | |
| tree | 6cefe967c5d609db413c01d5269a19bd9123e69a /deploy/adapters/ansible/roles | |
| parent | 8143bfe61f0f6739818fa92c2646859faea813ec (diff) | |
| parent | bc54b7f9a4c740cdccc3197686ac921ee8a2cc53 (diff) | |
Merge "add retry when rabbitmq join failed"
Diffstat (limited to 'deploy/adapters/ansible/roles')
3 files changed, 10 insertions, 3 deletions
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 b06aac50..c01ad4f6 100644 --- 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 f380f603..20b6fe4b 100644 --- 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 8b0ce9a9..0cae5298 100644 --- 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 |