From 327d89bd3833068d62935b605d3affc50ca7aeec Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 8 Sep 2015 18:17:56 -0700
Subject: [PATCH] Fix rabbitmq from failure during startup

Stagger the start times of the rabbitmq daemon so rabbitmq neither
crashes and also properly forms a cluster.  This problem exists in
the latest rabbitmq 3.5.4 available on rabbitmq.com for download.

Change-Id: Iac4186b3c3b586de38467294399c7ed9415244de
Closes-Bug: #1490780
---
 ansible/roles/rabbitmq/tasks/main.yml | 4 +---
 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 9e8bd5f551..8ef641d99d 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 99b09f288d..12db9923de 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 }