Fix cluster reset

Prevent to stop_app in the rabbitmq_master as it cannot be reset
if it is stopped. Also, when joining a cluster, the nodes
must use the short-hostname form of the master FQDN.

Signed-off-by: Erick Cardona <erick.cardona.ruiz@intel.com>

diff --git a/tasks/rabbitmq_clustering.yml b/tasks/rabbitmq_clustering.yml
index 9dece465591fb45158ab00b5fa4204eb4691fab7..5134c50dd61a9203b7b8a353017304f1d5200fc9 100644 (file)
--- a/tasks/rabbitmq_clustering.yml
+++ b/tasks/rabbitmq_clustering.yml
@@ -1,9 +1,11 @@
 ---
 - name: rabbitmq_clustering | stopping rabbitmq app
   command: rabbitmqctl stop_app
+  when: inventory_hostname != "{{ rabbitmq_master }}"
 
 - name: rabbitmq_clustering | resetting rabbitmq app
   command: rabbitmqctl reset
+  when: inventory_hostname != "{{ rabbitmq_master }}"
 
 - name: rabbitmq_clustering | stopping rabbitmq-server
   service:
@@ -55,7 +57,7 @@
   when: inventory_hostname != "{{ rabbitmq_master }}"
 
 - name: rabbitmq_clustering | joining rabbitmq cluster
-  command: rabbitmqctl join_cluster 'rabbit@{{ rabbitmq_master }}'
+  command: rabbitmqctl join_cluster "rabbit@{{ hostvars[rabbitmq_master]['ansible_hostname'] }}"
   register: cluster_joined
   when: inventory_hostname != "{{ rabbitmq_master }}"