From 223556e4e2efe35c77c4607408d47e67577a68f1 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 27 Mar 2024 16:15:54 +0000 Subject: [PATCH] RMQ: enable all stable feature flags at once Also enable these after an upgrade. Partial-Bug: #2058512 Change-Id: Ib9bdae2e25c2b6cce30e4c8024015ab5875bc1ff --- ansible/rabbitmq.yml | 2 +- ansible/roles/rabbitmq/defaults/main.yml | 17 ----------------- ansible/roles/rabbitmq/tasks/feature-flags.yml | 11 +++-------- ...-feature-flags-at-once-28b76958abf54083.yaml | 8 ++++++++ 4 files changed, 12 insertions(+), 26 deletions(-) create mode 100644 releasenotes/notes/rabbitmq-enable-all-feature-flags-at-once-28b76958abf54083.yaml diff --git a/ansible/rabbitmq.yml b/ansible/rabbitmq.yml index 896d52dd91..6b405cc626 100644 --- a/ansible/rabbitmq.yml +++ b/ansible/rabbitmq.yml @@ -64,7 +64,7 @@ include_role: name: rabbitmq tasks_from: post-deploy.yml - when: kolla_action in ['deploy', 'reconfigure'] + when: kolla_action in ['deploy', 'reconfigure', 'upgrade'] vars: role_rabbitmq_cluster_cookie: '{{ rabbitmq_cluster_cookie }}' role_rabbitmq_groups: rabbitmq diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index c08fd7c788..384f92becd 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/ansible/roles/rabbitmq/defaults/main.yml @@ -97,21 +97,4 @@ rabbitmq_plugins: rabbitmq_enabled_plugins: "{{ rabbitmq_plugins | selectattr('enabled', 'equalto', true) | list }}" -rabbitmq_feature_flags: - - "quorum_queue" - - "implicit_default_bindings" - - "virtual_host_metadata" - - "maintenance_mode_status" - - "user_limits" - - "stream_queue" - - "classic_queue_type_delivery_support" - - "tracking_records_in_ets" - - "stream_single_active_consumer" - - "listener_records_in_ets" - - "feature_flags_v2" - - "direct_exchange_routing_v2" - - "classic_mirrored_queue_version" - - "stream_sac_coordinator_unblock_group" - - "restart_streams" - kolla_externally_managed_cert: False diff --git a/ansible/roles/rabbitmq/tasks/feature-flags.yml b/ansible/roles/rabbitmq/tasks/feature-flags.yml index f889086a73..01a27ed920 100644 --- a/ansible/roles/rabbitmq/tasks/feature-flags.yml +++ b/ansible/roles/rabbitmq/tasks/feature-flags.yml @@ -1,10 +1,5 @@ --- -- name: Enable feature flags - kolla_toolbox: - container_engine: "{{ kolla_container_engine }}" - module_name: "community.rabbitmq.rabbitmq_feature_flag" - module_args: - name: "{{ item }}" - user: root +- name: Enable all stable feature flags + command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl enable_feature_flag all" become: true - loop: "{{ rabbitmq_feature_flags }}" + changed_when: false diff --git a/releasenotes/notes/rabbitmq-enable-all-feature-flags-at-once-28b76958abf54083.yaml b/releasenotes/notes/rabbitmq-enable-all-feature-flags-at-once-28b76958abf54083.yaml new file mode 100644 index 0000000000..fd2854de3c --- /dev/null +++ b/releasenotes/notes/rabbitmq-enable-all-feature-flags-at-once-28b76958abf54083.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + All stable RabbitMQ feature flags are now enabled during deployments, + reconfigures, and upgrades. As such, the variable + ``rabbitmq_feature_flags`` is no longer required. This is a partial fix to + RabbitMQ SLURP support. + `LP#2049512 `__