From 0679db069046dee486d5be0d3cf1c2d3a47f2ed5 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Sun, 17 Apr 2016 01:46:00 -0500 Subject: [PATCH] Fix server/hostname for RFC 1034/1035 This change ensures that the RabbitMQ ServerName is being set to the **ansible_hostname** fact. This ensures the RabbitMQ server has an appropriate server name which is compliant to the RFC. Change-Id: I1f6a161b3af8fd0edd677ac1c3f396e6e8b5d02e Signed-off-by: Kevin Carter --- defaults/main.yml | 2 +- tasks/rabbitmq_cluster.yml | 4 ++-- tasks/rabbitmq_started.yml | 4 ++-- tasks/rabbitmq_stopped.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 42323bee..647ff56d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,7 +16,7 @@ ## APT Cache Options cache_timeout: 600 -rabbitmq_primary_cluster_node: "{{ groups['rabbitmq_all'][0] }}" +rabbitmq_primary_cluster_node: "{{ hostvars[groups['rabbitmq_all'][0]]['ansible_hostname'] }}" # Upgrading the RabbitMQ package requires shutting down the cluster. This variable makes upgrading # the version an explicit action. diff --git a/tasks/rabbitmq_cluster.yml b/tasks/rabbitmq_cluster.yml index bac42460..0bac7842 100644 --- a/tasks/rabbitmq_cluster.yml +++ b/tasks/rabbitmq_cluster.yml @@ -15,8 +15,8 @@ - include: rabbitmq_cluster_create.yml when: > - inventory_hostname == rabbitmq_primary_cluster_node + ansible_hostname == rabbitmq_primary_cluster_node - include: rabbitmq_cluster_join.yml when: > - inventory_hostname != rabbitmq_primary_cluster_node + ansible_hostname != rabbitmq_primary_cluster_node diff --git a/tasks/rabbitmq_started.yml b/tasks/rabbitmq_started.yml index 0bbef5dc..f76369fc 100644 --- a/tasks/rabbitmq_started.yml +++ b/tasks/rabbitmq_started.yml @@ -19,7 +19,7 @@ state: started failed_when: false when: > - inventory_hostname == rabbitmq_primary_cluster_node + ansible_hostname == rabbitmq_primary_cluster_node tags: - rabbitmq-server-started - rabbitmq-upgrade @@ -31,7 +31,7 @@ state: started failed_when: false when: > - inventory_hostname != rabbitmq_primary_cluster_node + ansible_hostname != rabbitmq_primary_cluster_node tags: - rabbitmq-server-started - rabbitmq-upgrade diff --git a/tasks/rabbitmq_stopped.yml b/tasks/rabbitmq_stopped.yml index 404c9ead..cbc75f4e 100644 --- a/tasks/rabbitmq_stopped.yml +++ b/tasks/rabbitmq_stopped.yml @@ -19,7 +19,7 @@ state: stopped failed_when: false when: > - inventory_hostname != rabbitmq_primary_cluster_node + ansible_hostname != rabbitmq_primary_cluster_node tags: - rabbitmq-server-stopped - rabbitmq-upgrade @@ -31,7 +31,7 @@ state: stopped failed_when: false when: > - inventory_hostname == rabbitmq_primary_cluster_node + ansible_hostname == rabbitmq_primary_cluster_node tags: - rabbitmq-server-stopped - rabbitmq-upgrade