diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2015-12-17 17:11:24 +0800 |
|---|---|---|
| committer | carey xu <carey.xuhan@huawei.com> | 2015-12-24 02:09:47 +0000 |
| commit | bc54b7f9a4c740cdccc3197686ac921ee8a2cc53 (patch) | |
| tree | a1bb01b1bda2d039b5b0c9ff26bdb74a327ee11d /deploy | |
| parent | 6447ed5fe06bba5b973ba673780235d33c909302 (diff) | |
add retry when rabbitmq join failed
JIRA: COMPASS-206
Change-Id: I0cf7b2dd1414f3270ff894a6cf17aba5841e6848
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy')
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 |