Using new RabbitMQ config format (#5)

.gitignore

@@ -0,0 +1 @@
+.idea/

README.md

@@ -11,7 +11,7 @@ See:
 Set the `rabbitmq_version` variable to define the version of RabbitMQ to install.
 
 ```yaml
-rabbitmq_version: '3.7.7'
+rabbitmq_version: '3.8.1'
 ```
 
 ## Users
@@ -115,16 +115,21 @@ rabbitmq_plugins_disabled:
 
 See:
 
-- [Pico Trading - Config Encoder Macros](https://github.com/picotrading/config-encoder-macros)
-- [RabbitMQ - Configuration File](https://www.rabbitmq.com/configure.html#configuration-file)
+- [RabbitMQ - Configuration](https://www.rabbitmq.com/configure.html)
 
 Set the `rabbitmq_config` variable to define the configuration.
 
 ```yaml
 rabbitmq_config:
-  - rabbit:
-    - tcp_listeners:
-      - "'0.0.0.0'": 5671
+  listeners.tcp.default: 5672
+```
+
+Set the `rabbitmq_env` variable to define the environment variables. Note that the keys should not contain the
+"RABBITMQ_" prefix.
+
+```yaml
+rabbitmq_env:
+  DIST_PORT: 25672
 ```
 
 ## Cluster

defaults/main.yml

@@ -18,7 +18,7 @@ rabbitmq_users:
 rabbitmq_users_absent:
   - guest
 
-rabbitmq_version: '3.7.7'
+rabbitmq_version: '3.8.1'
 rabbitmq_vhosts: []
 rabbitmq_vhosts_absent: []
 

tasks/configure.yml

@@ -1,6 +1,18 @@
 ---
+- name: ensure old config file does not exist
+  file:
+    path: /etc/rabbitmq/rabbitmq.config
+    state: absent
+  notify: restart rabbitmq-server
 - name: configure rabbitmq
   template:
-    src: rabbitmq.config.j2
-    dest: /etc/rabbitmq/rabbitmq.config
+    src: rabbitmq.conf.j2
+    dest: /etc/rabbitmq/rabbitmq.conf
+  notify: restart rabbitmq-server
   when: rabbitmq_config is defined
+- name: configure rabbitmq environment
+  template:
+    src: rabbitmq-env.conf.j2
+    dest: /etc/rabbitmq/rabbitmq-env.conf
+  notify: restart rabbitmq-server
+  when: rabbitmq_env is defined

tasks/install-RedHat.yml

@@ -15,6 +15,8 @@
     repo_gpgcheck: '{{ rabbitmq_yum_repo_gpgcheck }}'
     gpgkey: '{{ rabbitmq_yum_repo_gpgkey | default(omit, true) }}'
 - name: Install RabbitMQ
-  package:
+  yum:
     name: rabbitmq-server-{{ rabbitmq_version }}
     state: present
+    update_cache: true
+  notify: restart rabbitmq-server

tasks/rabbitmq.yml

@@ -2,6 +2,8 @@
 - name: include rabbitmq installation tasks
   include: install-{{ ansible_os_family }}.yml
 
+- include: plugins.yml
+
 - include: configure.yml
 
 - include: configure-cluster.yml
@@ -17,7 +19,5 @@
 
 - include: users.yml
 
-- include: plugins.yml
-
 - include: cluster.yml
   when: rabbitmq_cluster|bool and rabbitmq_nodename != rabbitmq_cluster_master

templates/rabbitmq-env.conf.j2

@@ -0,0 +1,5 @@
+{{ ansible_managed | comment }}
+
+{% for item in (rabbitmq_env | dict2items | sort(attribute='key')) %}
+{{ item.key }}={{ item.value | to_json }}
+{% endfor %}

templates/rabbitmq.conf.j2

@@ -0,0 +1,5 @@
+{{ ansible_managed | comment }}
+
+{% for item in (rabbitmq_config | dict2items | sort(attribute='key')) %}
+{{ item.key }} = {{ item.value | to_json | replace('"', '') }}
+{% endfor %}