Merge "rabbitmq: enable/disable prometheus plugin follow up" into stable/victoria

Author: Zuul

ansible/group_vars/all.yml

@@ -801,14 +801,6 @@ outward_rabbitmq_user: "openstack"
 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_enable_prometheus_plugin: "{{ enable_prometheus }}"
-rabbitmq_plugins:
-  - name: "rabbitmq_management"
-    enabled: True
-  - name: "rabbitmq_prometheus"
-    enabled: "{{ rabbitmq_enable_prometheus_plugin | bool }}"
-
-rabbitmq_enabled_plugins: "{{ rabbitmq_plugins | selectattr('enabled', 'equalto', true) | list }}"
 
 ####################
 # Qdrouterd options

ansible/roles/rabbitmq/defaults/main.yml

@@ -74,3 +74,15 @@ rabbitmq_server_additional_erl_args: "+S 2:2 +sbwt none +sbwtdcpu none +sbwtdio
 rabbitmq_tls_options: {}
 # To avoid split-brain
 rabbitmq_cluster_partition_handling: "pause_minority"
+
+####################
+# Plugins
+####################
+rabbitmq_enable_prometheus_plugin: "{{ enable_prometheus }}"
+rabbitmq_plugins:
+  - name: "rabbitmq_management"
+    enabled: True
+  - name: "rabbitmq_prometheus"
+    enabled: "{{ rabbitmq_enable_prometheus_plugin | bool }}"
+
+rabbitmq_enabled_plugins: "{{ rabbitmq_plugins | selectattr('enabled', 'equalto', true) | list }}"