From 6c238ca3bfc082813252098735e3fd6062ad952e Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Fri, 26 Aug 2016 16:18:04 +0100
Subject: [PATCH] Move rabbitmq precheck from start

rabbitmq's start task contains a precheck. This should be part of the
other prechecks for consistency

TrivialFix

Change-Id: I7728ec3f5be3248424d74a4387925b72114b8943
---
 ansible/roles/prechecks/tasks/port_checks.yml | 10 ++++++++++
 ansible/roles/rabbitmq/tasks/bootstrap.yml    | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index 7f8724aaea..91a0305a3c 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -343,6 +343,16 @@
     state: stopped
   when: inventory_hostname in groups['rabbitmq']
 
+- name: Check if all rabbit hostnames are resolvable
+  command: "getent ahostsv4 {{ hostvars[item]['ansible_hostname'] }}"
+  changed_when: false
+  register: rabbitmq_hostnames
+  with_items: "{{ groups['rabbitmq'] }}"
+
+- fail: msg="Hostname has to resolve to IP address of api_interface"
+  with_items: "{{ rabbitmq_hostnames.results }}"
+  when: "'{{ hostvars[item['item']]['ansible_' + hostvars[item['item']]['api_interface']]['ipv4']['address'] }}' not in '{{ item.stdout }}'"
+
 - name: Checking free port for Mongodb
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml
index d95c417495..e5a5eb97dd 100644
--- a/ansible/roles/rabbitmq/tasks/bootstrap.yml
+++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml
@@ -1,14 +1,4 @@
 ---
-- name: Check if all rabbit hostnames are resolvable
-  command: "getent ahostsv4 {{ hostvars[item]['ansible_hostname'] }}"
-  changed_when: false
-  register: rabbitmq_hostnames
-  with_items: "{{ groups['rabbitmq'] }}"
-
-- fail: msg="Hostname has to resolve to IP address of api_interface"
-  with_items: "{{ rabbitmq_hostnames.results }}"
-  when: "'{{ hostvars[item['item']]['ansible_' + hostvars[item['item']]['api_interface']]['ipv4']['address'] }}' not in '{{ item.stdout }}'"
-
 - name: Creating rabbitmq volume
   kolla_docker:
     action: "create_volume"