From 8e6833be8510f67c80b6ddbc9f15c4007526b4fa Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 28 Sep 2020 09:47:47 +0100 Subject: [PATCH] Require the use of community.rabbitmq ansible collection Remove the ansible 2.9 compatibility task. This change means that this role requires either ansible 2.9 or 2.10, with the community.rabbitmq collection in order to give the 'broker_state' parameter for the rabbitmq_plugin module. Change-Id: I430c8edc8c973b9018ff9a4d865c174ee07dcc7a --- tasks/rabbitmq_post_install.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tasks/rabbitmq_post_install.yml b/tasks/rabbitmq_post_install.yml index b1ef25ee..3331be66 100644 --- a/tasks/rabbitmq_post_install.yml +++ b/tasks/rabbitmq_post_install.yml @@ -64,7 +64,7 @@ # don't trigger ANSIBLE0016 - skip_ansible_lint -- name: Configure rabbitmq plugins (ansible 2.10.x with rabbitmq collection) +- name: Configure rabbitmq plugins community.rabbitmq.rabbitmq_plugin: names: "{{ item.name }}" state: "{{ item.state }}" @@ -73,17 +73,6 @@ register: rabbitmq_plugin tags: - rabbitmq-config - when: ansible_version.full is version('2.10', '>') - -- name: Configure rabbitmq plugins (ansible 2.9.x) - community.rabbitmq.rabbitmq_plugin: - names: "{{ item.name }}" - state: "{{ item.state }}" - with_items: "{{ rabbitmq_plugins }}" - register: rabbitmq_plugin - tags: - - rabbitmq-config - when: ansible_version.full is version('2.10', '<') - include_tasks: rabbitmq_restart.yml when: rabbit_config is changed or rabbitmq_plugin is changed or cookie_set is changed or rabbitmq_upgrade | bool