Merge "rabbitmq: add rabbitmq_datadir_volume parameter"

ansible/group_vars/all.yml

@@ -927,6 +927,7 @@ outward_rabbitmq_external_fqdn: "{{ kolla_external_fqdn }}"
 rabbitmq_enable_tls: "no"
 # CA certificate bundle in RabbitMQ container.
 rabbitmq_cacert: "/etc/ssl/certs/{{ 'ca-certificates.crt' if kolla_base_distro in ['debian', 'ubuntu'] else 'ca-bundle.trust.crt' }}"
+rabbitmq_datadir_volume: "rabbitmq"
 
 ####################
 # HAProxy options

ansible/roles/rabbitmq/defaults/main.yml

@@ -72,7 +72,7 @@ rabbitmq_default_volumes:
   - "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "{{ project_name }}:/var/lib/rabbitmq/"
+  - "{{ rabbitmq_datadir_volume }}:/var/lib/rabbitmq/"
   - "kolla_logs:/var/log/kolla/"
 rabbitmq_extra_volumes: "{{ default_extra_volumes }}"
 

releasenotes/notes/rabbitmq_datadir_volume-76e5524b72129144.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    With the parameter ``rabbitmq_datadir_volume`` it is possible
+    to use a directory as volume for the rabbitmq service. By default,
+    a volume named rabbitmq is used (the previous default).