diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index cfb6d7f332..002e9a5690 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -797,14 +797,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 diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index 07af33c027..ebf63ecebd 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/ansible/roles/rabbitmq/defaults/main.yml @@ -88,3 +88,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 }}"