openstack/openstack-ansible-rabbitmq_server
Code Issues Proposed changes

Auto-fix usage of modules via FQCN

Browse Source 
Since ansible-core 2.10 it is recommended to use modules via FQCN
In order to align with recommendation, we perform migration
by applying suggestions made by `ansible-lint --fix=fqcn`

Change-Id: Id8a34727251ade1a1b2d5a881e5ee5e808b495dc
This commit is contained in:
Dmitriy Rabotyagov
2025-02-13 08:44:28 +01:00
parent 6afb2944dc
commit 858b79056d
13 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/main.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: "Ensure RabbitMQ is stopped"
service:
ansible.builtin.service:
name: rabbitmq-server
state: stopped
listen:
@ -22,7 +22,7 @@
- RabbitMQ restart
- name: "Ensure RabbitMQ is started"
service:
ansible.builtin.service:
name: rabbitmq-server
state: started
enabled: true
@ -31,7 +31,7 @@
- RabbitMQ restart
- name: Wait for rabbitmq to be started
wait_for:
ansible.builtin.wait_for:
host: "{{ item.key }}"
port: "{{ item.value }}"
loop: "{{ query('dict', rabbitmq_port_bindings.tcp_listeners) }}"

14
tasks/install_apt.yml
View File

@ -21,7 +21,7 @@
fail_msg: "The following repository definitions must be updated to deb822 format {{ _repo_check }}"
- name: Run the apt package pinning role
include_role:
ansible.builtin.include_role:
name: apt_package_pinning
vars:
apt_package_pinning_file_name: "rabbitmq.pref"
@ -45,14 +45,14 @@
rabbitmq_apt_repo_cleanup:
- RabbitMQ.list
- els_erlang.list
file:
ansible.builtin.file:
path: "/etc/apt/sources.list.d/{{ item }}"
state: absent
with_items: "{{ rabbitmq_apt_repo_cleanup }}"
register: apt_repo_removed
- name: Ensure python3-debian package is available
apt:
ansible.builtin.apt:
name: python3-debian
- name: Manage apt repositories
@ -83,12 +83,12 @@
register: deb822_repos
- name: Update apt repositories when config is changed
apt:
ansible.builtin.apt:
update_cache: true
when: (apt_repo_removed is changed) or (deb822_repos is changed)
- name: Install RabbitMQ package dependencies
apt:
ansible.builtin.apt:
pkg: "{{ rabbitmq_dependencies }}"
state: "{{ rabbitmq_package_state }}"
update_cache: true
@ -103,7 +103,7 @@
- rabbitmq-apt-packages
- name: Install the RabbitMQ package deb
apt:
ansible.builtin.apt:
deb: "{{ rabbitmq_package_path }}"
register: install_rabbitmq
notify:
@ -115,7 +115,7 @@
- rabbitmq-apt-packages
- name: Install RabbitMQ packages
package:
ansible.builtin.package:
name: "{{ rabbitmq_distro_packages }}"
state: "{{ rabbitmq_package_state }}"
register: install_packages

8
tasks/install_yum.yml
View File

@ -14,14 +14,14 @@
# limitations under the License.
- name: Fail if installation method is not 'external_repo' or 'distro'
fail:
ansible.builtin.fail:
msg: "The only supported rabbitmq_install_method for RedHat is 'external_repo' and 'distro'."
when:
- rabbitmq_install_method != 'external_repo'
- rabbitmq_install_method != 'distro'
- name: Configure repositories
yum_repository:
ansible.builtin.yum_repository:
name: "{{ item.name }}"
file: "{{ item.filename }}"
description: "{{ item.description }}"
@ -36,7 +36,7 @@
- rabbitmq-repos
- name: Install RabbitMQ packages
yum:
ansible.builtin.dnf:
name: "{{ rabbitmq_distro_extras_repo }}"
state: "{{ rabbitmq_package_state }}"
when:
@ -45,7 +45,7 @@
- rabbitmq-repos
- name: Install RabbitMQ packages
yum:
ansible.builtin.dnf:
name: "{{ rabbitmq_distro_packages }}"
state: "{{ rabbitmq_package_state }}"
notify:

20
tasks/main.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: Gather variables for each operating system
include_vars: "{{ lookup('first_found', params) }}"
ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
vars:
params:
files:
@ -29,13 +29,13 @@
- always
- name: Importing rabbitmq_pre_install tasks
import_tasks: rabbitmq_pre_install.yml
ansible.builtin.import_tasks: rabbitmq_pre_install.yml
tags:
- rabbitmq_server-install
# The install process will be skipped if `rabbitmq_ignore_version_state=true`
- name: Including rabbitmq_install tasks
include_tasks: rabbitmq_install.yml
ansible.builtin.include_tasks: rabbitmq_install.yml
when: not rabbitmq_ignore_version_state | bool
args:
apply:
@ -46,7 +46,7 @@
- always
- name: Create and install SSL certificates
include_role:
ansible.builtin.include_role:
name: pki
tasks_from: "{{ rabbitmq_pki_create_ca | ternary('main.yml', 'main_certs.yml') }}"
vars:
@ -62,22 +62,22 @@
pki_install_certificates: "{{ rabbitmq_pki_install_certificates }}"
- name: Importing rabbitmq_post_install tasks
import_tasks: rabbitmq_post_install.yml
ansible.builtin.import_tasks: rabbitmq_post_install.yml
tags:
- rabbitmq_server-config
- rabbitmq-config
- name: Flush handlers
meta: flush_handlers
ansible.builtin.meta: flush_handlers
- name: Importing rabbitmq_cluster tasks
import_tasks: rabbitmq_cluster.yml
ansible.builtin.import_tasks: rabbitmq_cluster.yml
tags:
- rabbitmq_server-config
- rabbitmq-cluster
- name: Including rabbitmq_setup tasks
include_tasks: rabbitmq_setup.yml
ansible.builtin.include_tasks: rabbitmq_setup.yml
when:
- _rabbitmq_is_last_play_host
args:
@ -93,7 +93,7 @@
- rabbitmq_upgrade
block:
- name: Including rabbitmq_cluster_state tasks
include_tasks: rabbitmq_cluster_state.yml
ansible.builtin.include_tasks: rabbitmq_cluster_state.yml
args:
apply:
tags:
@ -102,7 +102,7 @@
- rabbitmq-upgrade
- name: Importing rabbitmq_feature_flags tasks
include_tasks: rabbitmq_feature_flags.yml
ansible.builtin.include_tasks: rabbitmq_feature_flags.yml
args:
apply:
tags:

6
tasks/rabbitmq_cluster.yml
View File

@ -14,17 +14,17 @@
# limitations under the License.
- name: Importing rabbitmq_cluster_state tasks
import_tasks: rabbitmq_cluster_state.yml
ansible.builtin.import_tasks: rabbitmq_cluster_state.yml
- name: Set rabbitmq cluster name on primary node # noqa: no-changed-when
command: |
ansible.builtin.command: |
rabbitmqctl set_cluster_name {{ rabbitmq_cluster_name }}
when:
- "ansible_facts['hostname'] == rabbitmq_primary_cluster_node"
- "_cluster_state.get('cluster_name') != rabbitmq_cluster_name"
- name: Join cluster on secondary nodes
include_tasks: rabbitmq_cluster_join.yml
ansible.builtin.include_tasks: rabbitmq_cluster_join.yml
when:
- "ansible_facts['hostname'] != rabbitmq_primary_cluster_node"
- "_cluster_state.get('cluster_name') != rabbitmq_cluster_name"

4
tasks/rabbitmq_cluster_state.yml
View File

@ -14,11 +14,11 @@
# limitations under the License.
- name: "Gather cluster status"
command: "rabbitmqctl cluster_status --formatter json"
ansible.builtin.command: "rabbitmqctl cluster_status --formatter json"
register: _cluster_status
changed_when: false
failed_when: false
- name: Define cluster_state fact
set_fact:
ansible.builtin.set_fact:
_cluster_state: "{{ (_cluster_status.rc == 0) | ternary(_cluster_status.stdout, {} | string) | from_json }}"

4
tasks/rabbitmq_feature_flags.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: "Check for disabled RabbitMQ feature flags"
command: "rabbitmqctl list_feature_flags --formatter json name state stability"
ansible.builtin.command: "rabbitmqctl list_feature_flags --formatter json name state stability"
register: _feature_flags
changed_when: false
failed_when: false
@ -22,7 +22,7 @@
# NOTE: changed_when required despite the above check because 'unstable'
# feature flags will remain disabled each time this runs
- name: "Enable missing RabbitMQ feature flags"
command: "rabbitmqctl enable_feature_flag {{ flag['name'] }}"
ansible.builtin.command: "rabbitmqctl enable_feature_flag {{ flag['name'] }}"
changed_when: false
loop: "{{ _feature_flags.stdout | from_json | rejectattr('stability', 'eq', 'experimental') | selectattr('state', 'eq', 'disabled') }}"
loop_control:

8
tasks/rabbitmq_install.yml
View File

@ -14,10 +14,10 @@
# limitations under the License.
- name: Importing rabbitmq_upgrade_check tasks
import_tasks: rabbitmq_upgrade_check.yml
ansible.builtin.import_tasks: rabbitmq_upgrade_check.yml
- name: Including install tasks
include_tasks: "install_{{ ansible_facts['pkg_mgr'] }}.yml"
ansible.builtin.include_tasks: "install_{{ ansible_facts['pkg_mgr'] }}.yml"
args:
apply:
tags:
@ -28,7 +28,7 @@
- always
- name: Reload the systemd daemon
systemd:
ansible.builtin.systemd:
daemon_reload: true
when:
- install_rabbitmq is changed
@ -38,7 +38,7 @@
- rabbitmq_server-install
- name: Ensure there are no policy-rc files
file:
ansible.builtin.file:
path: "/usr/sbin/policy-rc.d"
state: absent
tags:

6
tasks/rabbitmq_post_install.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: Set rabbit cookie
copy:
ansible.builtin.copy:
content: "{{ rabbitmq_cookie_token }}"
dest: /var/lib/rabbitmq/.erlang.cookie
mode: "0400"
@ -27,7 +27,7 @@
- rabbitmq-config
- name: Create rabbitmq config
template:
ansible.builtin.template:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
owner: "{{ rabbit_system_user_name }}"
@ -44,7 +44,7 @@
- rabbitmq-config
- name: Apply systemctl overrides
import_role:
ansible.builtin.import_role:
name: systemd_service
vars:
systemd_user_name: "{{ rabbit_system_user_name }}"

16
tasks/rabbitmq_pre_install.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: Download the RabbitMQ package
get_url:
ansible.builtin.get_url:
url: "{{ rabbitmq_package_url }}"
dest: "{{ rabbitmq_package_path }}"
mode: "0644"
@ -33,24 +33,24 @@
- name: Manage /etc/hosts files
block:
- name: Fail if hosts file is not managed yet
command: grep "OPENSTACK-ANSIBLE MANAGED BLOCK" /etc/hosts
ansible.builtin.command: grep "OPENSTACK-ANSIBLE MANAGED BLOCK" /etc/hosts
changed_when: false
rescue:
- name: Rescue failure and add required records
lineinfile:
ansible.builtin.lineinfile:
dest: /etc/hosts
state: present
line: "{{ item.address }} {{ item.hostnames | join(' ') }}"
with_items: "{{ rabbitmq_hosts_entries }}"
always:
- name: Ensure localhost /etc/hosts entry is correct
lineinfile:
ansible.builtin.lineinfile:
dest: /etc/hosts
state: present
line: "127.0.0.1 localhost"
regexp: "^127\\.0\\.0\\.1"
- name: Remove hostname record for 127.0.1.1
replace:
ansible.builtin.replace:
path: /etc/hosts
regexp: '^(127\.0\.1\.1)\s*(\S*)\s*({{ ansible_facts["hostname"] }})($|\s.*)'
replace: "\\1 \\2 \\4"
@ -60,13 +60,13 @@
- rabbitmq-config
- name: Create the system group
group:
ansible.builtin.group:
name: "{{ rabbit_system_group_name }}"
state: "present"
system: "yes"
- name: Create the rabbit system user
user:
ansible.builtin.user:
name: "{{ rabbit_system_user_name }}"
group: "{{ rabbit_system_group_name }}"
comment: "RabbitMQ messaging server"
@ -76,7 +76,7 @@
home: "/var/lib/rabbitmq"
- name: Create the local directories
file:
ansible.builtin.file:
path: "/etc/rabbitmq/"
state: "directory"
owner: "root"

4
tasks/rabbitmq_stopped.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: "Ensure RabbitMQ nodes [1:] are stopped"
service:
ansible.builtin.service:
name: rabbitmq-server
state: stopped
failed_when: false
@ -26,7 +26,7 @@
- rabbitmq-stop
- name: "Ensure RabbitMQ node [0] is stopped"
service:
ansible.builtin.service:
name: rabbitmq-server
state: stopped
failed_when: false

16
tasks/rabbitmq_upgrade_check.yml
View File

@ -17,7 +17,7 @@
# so we skip this task in the ansible-lint check by using the
# 'skip_ansible_lint' tag
- name: Get version of installed RabbitMQ package (deb)
command: "dpkg-query -f='${Version}' -W rabbitmq-server"
ansible.builtin.command: "dpkg-query -f='${Version}' -W rabbitmq-server"
changed_when: false
check_mode: false
failed_when: false
@ -33,7 +33,7 @@
# so we skip this task in the ansible-lint check by using the
# 'skip_ansible_lint' tag
- name: Get version of installed RabbitMQ package (rpm)
command: "rpm --queryformat '%{VERSION}' -q rabbitmq-server"
ansible.builtin.command: "rpm --queryformat '%{VERSION}' -q rabbitmq-server"
changed_when: false
check_mode: false
failed_when: false
@ -46,7 +46,7 @@
- skip_ansible_lint
- name: Register a fact for the installed RabbitMQ version
set_fact:
ansible.builtin.set_fact:
installed_rabbitmq: "{{ item }}"
when:
- item is not skipped
@ -55,7 +55,7 @@
- "{{ installed_rabbitmq_rpm }}"
- name: Ensure installed RabbitMQ version is same as expected
fail:
ansible.builtin.fail:
msg: "To install a new major/minor version of RabbitMQ set '-e rabbitmq_upgrade=true'."
when:
- not rabbitmq_upgrade | bool
@ -68,7 +68,7 @@
- rabbitmq-apt-packages
- name: Ensure that RabbitMQ is running minimal required version for upgrade
fail:
ansible.builtin.fail:
msg: |
Minimal required version for proceeding with RabbitMQ upgrade to {{ rabbitmq_package_version }} is {{ _minimal_required_version }}.
Please, upgrade to the version {{ _minimal_required_version }} before proceeding with further upgrade.
@ -87,7 +87,7 @@
- rabbitmq-apt-packages
- name: Including rabbitmq_cluster_state tasks
include_tasks: rabbitmq_cluster_state.yml
ansible.builtin.include_tasks: rabbitmq_cluster_state.yml
args:
apply:
tags:
@ -106,7 +106,7 @@
- (_cluster_state.get('partitions', []) | length) == 0
block:
- name: Including rabbitmq_feature_flags tasks
include_tasks: rabbitmq_feature_flags.yml
ansible.builtin.include_tasks: rabbitmq_feature_flags.yml
args:
apply:
tags:
@ -117,7 +117,7 @@
- rabbitmq-upgrade
- name: Including rabbitmq_upgrade_prep tasks
include_tasks: rabbitmq_upgrade_prep.yml
ansible.builtin.include_tasks: rabbitmq_upgrade_prep.yml
args:
apply:
tags:

8
tasks/rabbitmq_upgrade_prep.yml
View File

@ -14,7 +14,7 @@
# limitations under the License.
- name: Prevent RabbitMQ from starting on install
copy:
ansible.builtin.copy:
src: "policy-rc.d"
dest: "/usr/sbin/policy-rc.d"
mode: "0755"
@ -24,15 +24,15 @@
- rabbitmq-upgrade
- name: Set node for maintenance state
command: rabbitmq-upgrade drain --quiet
ansible.builtin.command: rabbitmq-upgrade drain --quiet
changed_when: false
- name: Pause to allow node to sync
pause:
ansible.builtin.pause:
seconds: 10
- name: "Ensure RabbitMQ is stopped"
service:
ansible.builtin.service:
name: rabbitmq-server
state: stopped
notify: