diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-09 07:49:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-09 07:49:55 +0000 |
| commit | 789ea6e0a26fb91b190675edf27a181669c55fa3 (patch) | |
| tree | 332aa0a8fb6660dae7c9f8fb247ff57b8442094e | |
| parent | 800e69e8fe102a95b6fd2c2ff0448d14ff6b0897 (diff) | |
| parent | 327d89bd3833068d62935b605d3affc50ca7aeec (diff) | |
| download | kolla-789ea6e0a26fb91b190675edf27a181669c55fa3.tar.gz kolla-789ea6e0a26fb91b190675edf27a181669c55fa3.zip | |
Merge "Fix rabbitmq from failure during startup"
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/main.yml | 4 | ||||
| -rwxr-xr-x | ansible/site.yml | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ansible/roles/rabbitmq/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml index 9e8bd5f55..8ef641d99 100644 --- a/ansible/roles/rabbitmq/tasks/main.yml +++ b/ansible/roles/rabbitmq/tasks/main.yml @@ -6,8 +6,6 @@ - include: start.yml - name: Sleep while cluster starts - command: sleep 15 + command: sleep 5 changed_when: False failed_when: False - -- include: start.yml diff --git a/ansible/site.yml b/ansible/site.yml index 99b09f288..12db9923d 100755 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -8,6 +8,7 @@ - { role: mariadb, tags: mariadb, when: enable_mariadb | bool } - hosts: rabbitmq + serial: 1 roles: - { role: rabbitmq, tags: rabbitmq, when: enable_rabbitmq | bool } |