Merge pull request #12 from stone-payments/feat/cluster-longname

fix/cluster longname
stone-payments · Jun 14, 2019 · a3b5f7f · a3b5f7f
2 parents e5d0468 + e011e9f
commit a3b5f7f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -159,6 +159,14 @@ give some extra vars.
       rabbitmq_clustering_enabled: true
       rabbitmq_master_node: "your_master_node"
 ```
+To create a cluster using FQDN for hosts, just set USE_LONGNAME.
+
+```yaml
+    vars:
+      rabbitmq_conf_env:
+        USE_LONGNAME: "true"
+```
+
 
 Notice that the cookie is hash string that can be of any size. A good practice is
 use a hash of 20 characters. This is the syncronization cookie used by erlang to

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -27,7 +27,7 @@ rabbitmq_enabled_plugins_file_group: rabbitmq
 rabbitmq_enabled_plugins_file_mode: 0644
 
 rabbitmq_config_file_path: "/etc/rabbitmq/rabbitmq.config"
-rabbitmq_env_variables_file_path: "/etc/rabbitmq/rabbitmq-env.config"
+rabbitmq_env_variables_file_path: "/etc/rabbitmq/rabbitmq-env.conf"
 rabbitmq_config_file_owner: root
 rabbitmq_config_file_group: rabbitmq
 rabbitmq_config_file_mode: 0644

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={{ inventory_hostname }}
+NODENAME=rabbit@{{ inventory_hostname }}