Merge pull request #22 from stone-payments/feat/customize-nodename

Feat/customize nodename
stone-payments · Jun 18, 2019 · 5b8f2e1 · 5b8f2e1
2 parents ad17711 + 79f6427
commit 5b8f2e1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -114,7 +114,7 @@ None yet.
       roles:
         - stone-payments.rabbitmq
 ```
-By default this role will install the currently last upstream version of RabbitMQ (which is 3.7.4). If you want to install any other version you must give the version numbers.
+By default this role will install the currently last upstream version of RabbitMQ (which is 3.7.15). If you want to install any other version you must give the version numbers.
 
 ```yaml
     - hosts: servers
@@ -125,13 +125,14 @@ By default this role will install the currently last upstream version of RabbitM
           rabbitmq_patch: 9
 ```
 
-Specific RabbitMQ environment variables can also be given.
+By default the role will try the configure the NODENAME with `rabbit@{{ansible_fqdn}}` when clustering is enabled, if you want to customize the node name, you can substitute the NODENAME with the variables `rabbitmq_nodename_prefix`and `rabbitmq_nodename_hostname`.
+
+Others specific RabbitMQ environment variables can also be given.
 
 ```yaml
     vars:
       rabbitmq_conf_env:
         RABBITMQ_NODE_IP_ADDRESS: "127.0.0.2"
-        RABBITMQ_NODENAME: "nodename"
 ```
 
 You can alter: 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -61,7 +61,9 @@ rabbitmq_plugins:
 # RabbitMQ cluster
 rabbitmq_clustering_enabled: false
 rabbitmq_erlang_cookie_file_path: "/var/lib/rabbitmq/.erlang.cookie"
-
+rabbitmq_master_node_inventory_hostname: "{{rabbitmq_master_node}}"
+rabbitmq_nodename_prefix: rabbit
+rabbitmq_nodename_hostname: "{{ansible_fqdn}}"
 
 # RabbitMQ repositories on satellite
-rabbitmq_repository_on_satellite:
+rabbitmq_repository_on_satellite:
diff --git a/tasks/clustering.yml b/tasks/clustering.yml
@@ -21,21 +21,22 @@
 
   - name: stop rabbitmq app
     command: rabbitmqctl stop_app
-    when: "inventory_hostname != rabbitmq_master_node"
+    when: "inventory_hostname != rabbitmq_master_node_inventory_hostname"
 
   - name: join rabbitmq cluster
     command: rabbitmqctl join_cluster "rabbit@{{ rabbitmq_master_node }}"
     register: cluster_joined
-    when: "inventory_hostname != rabbitmq_master_node"
+    when: "inventory_hostname != rabbitmq_master_node_inventory_hostname"
     retries: 2
     delay: 1
 
   - name: start rabbitmq app
     command: rabbitmqctl start_app
-    when: "inventory_hostname != rabbitmq_master_node"
+    when: "inventory_hostname != rabbitmq_master_node_inventory_hostname"
 
   when:
     - rabbitmq_clustering_enabled
     - rabbitmq_master_node is defined
+    - rabbitmq_master_node_inventory_hostname is defined
     - rabbitmq_erlang_cookie is defined
     - nodes_count.stdout|int < play_hosts|length
diff --git a/templates/rabbitmq-env.conf.j2 b/templates/rabbitmq-env.conf.j2
@@ -1,4 +1,4 @@
 {% for variable,value in rabbitmq_conf_env.iteritems() %}
 {{ variable|upper() }}={{ value }}
 {% endfor %}
-NODENAME=rabbit@{{ inventory_hostname }}
+NODENAME={{ rabbitmq_nodename_prefix }}@{{ rabbitmq_nodename_hostname }}