Merge branch 'main' into paddyroddy-patch-1

.ansible-lint

@@ -1,6 +1,7 @@
 ---
 warn_list:
-  - no-handler
+  - fqcn[action-core]
   - galaxy[no-changelog]
   - galaxy[tags]
+  - no-handler
   - var-naming[no-role-prefix]

playbooks/molecule/resources/shared/prepare.yml

@@ -14,7 +14,7 @@
   gather_facts: true
   tasks:
     - name: Install crontabs
-      ansible.builtin.dnf:
+      ansible.builtin.yum:
         name: cronie
         state: present
     - name: Start crontabs service

roles/docker/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensure docker dependencies are installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ item }}"
     state: installed
   loop:
@@ -9,7 +9,7 @@
     - lvm2
 
 - name: Install "epel-release" for centos:7
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: epel-release
     state: installed
   when:
@@ -31,7 +31,7 @@
       - "{{ docker_rpm_gpg_key_url }}"
 
 - name: Ensure docker is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ item }}"
     state: installed
     allow_downgrade: true

roles/install_python/tasks/RedHat.yml

@@ -1,6 +1,6 @@
 ---
 # OS specific tasks for the RedHat family
 - name: Install EPEL for RedHat OSes
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: epel-release
     state: installed

roles/monitoring_server/tasks/install_nginx_container.yml

@@ -1,14 +1,14 @@
 ---
 - name: Ensure passlib is installed on centos7
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: python-passlib
     state: present
   when:
     ansible_facts['os_family'] == "RedHat" and
     ansible_facts['distribution_major_version'] is version("7")
 
 - name: Ensure passlib is installed on rocky9
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: python3-passlib
     state: present
   when:
@@ -72,7 +72,7 @@
   community.docker.docker_container:
     name: nginx
     hostname: nginx
-    image: nginx@sha256:ed6d2c43c8fbcd3eaa44c9dab6d94cb346234476230dc1681227aa72d07181ee
+    image: nginx@sha256:0f04e4f646a3f14bf31d8bc8d885b6c951fdcf42589d06845f64d18aec6a3c4d
     state: started
     networks:
       - name: monitor-net

roles/nginx/tasks/main.yml

@@ -25,12 +25,12 @@
         ansible_facts['distribution_major_version'] is version("8", ">=")
 
 - name: Ensure epel is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: epel-release
     state: installed
 
 - name: Ensure nginx is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name:
       - nginx
       - nginx-mod-stream

roles/omero_server/tasks/pre-tasks.yml

@@ -18,13 +18,13 @@
     ice_install_python: false
 
 - name: Ensure postgres RPM is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ postgresql_install.rpm }}"
     state: present
     disable_gpg_check: "{{ postgresql_install.disable_gpg_check }}"
 
 - name: Ensure postgresql is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ postgresql_install.yum_client_package }}"
     state: installed
 

roles/postgresql/README.md

@@ -92,7 +92,7 @@ To use this role with a dual-server setup (a dartase `db` and a web server
   gather_facts: true
   tasks:
     - name: Install openssl
-      ansible.builtin.dnf:
+      ansible.builtin.yum:
         name: openssl
         state: present
 

roles/postgresql/molecule/resources/prepare.yml

@@ -11,7 +11,7 @@
     - role: mirsg.infrastructure.provision
   tasks:
     - name: Install crontabs
-      ansible.builtin.dnf:
+      ansible.builtin.yum:
         name: cronie
         state: present
 

roles/postgresql/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 # tasks file for postgresql
 - name: Setup for RedHat 7 - install sefcontext dependencies and psycopg2
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name:
       - libselinux-python
       - policycoreutils-python
@@ -12,7 +12,7 @@
     ansible_facts['distribution_major_version'] is version('7')
 
 - name: Setup for RedHat 8+ - install sefcontext dependencies and psycopg2
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name:
       - python3-libselinux
       - policycoreutils-python-utils
@@ -23,18 +23,18 @@
     ansible_facts['distribution_major_version'] is version('7', '>')
 
 - name: Ensure postgres RPM is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ postgresql_install.rpm }}"
     state: present
     disable_gpg_check: "{{ postgresql_install.disable_gpg_check }}"
 
 - name: Ensure postgresql is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ postgresql_install.yum_package }}"
     state: installed
 
 - name: Ensure postgresql contrib is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "{{ postgresql_install.yum_contrib_package }}"
     state: installed
   when:

roles/postgresql_upgrade/molecule/resources/prepare.yml

@@ -9,7 +9,7 @@
         state: present
 
     - name: Install crontabs
-      ansible.builtin.dnf:
+      ansible.builtin.yum:
         name: cronie
         state: present
 

roles/provision/tasks/CentOS.yml

@@ -35,7 +35,7 @@
         state: absent
 
     - name: Install locales # noqa: package-latest
-      ansible.builtin.dnf:
+      ansible.builtin.yum:
         name: glibc-common
         state: latest
 

roles/provision/tasks/Rocky.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure the ca-certificates package is installed
   become: true
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: ca-certificates
     state: present
 
@@ -30,7 +30,7 @@
   when: found_locale.rc != 0
   block:
     - name: Install locale
-      ansible.builtin.dnf:
+      ansible.builtin.yum:
         name: glibc-langpack-en
         state: present
 

roles/provision/tasks/main.yml

@@ -8,18 +8,19 @@
   ansible.builtin.include_tasks: "{{ ansible_distribution }}.yml"
 
 - name: Upgrade all packages # noqa: package-latest
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: "*"
     state: latest
     exclude:
       # https://groups.google.com/g/xnat_discussion/c/yyPBkN4kayE/m/LUe5GQH5AAAJ
       - docker-ce
       - docker-ce-cli
+
   tags:
     - molecule-idempotence-notest
 
 - name: Ensure epel is installed
   become: true
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: epel-release
     state: installed

roles/ssl_certificates/README.md

@@ -13,7 +13,7 @@ installed before using this role:
 
 ```yaml
 - name: Install openssl
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: openssl
     state: present
   when: ssl_certificate.use_pk8

roles/tomcat/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensure Ansible seport dependencies are installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name:
       - libselinux-python
       - policycoreutils-python
@@ -10,7 +10,7 @@
     ansible_facts['distribution_major_version'] is version('7')
 
 - name: Ensure Ansible seport dependencies are installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name:
       - python3-libselinux
       - policycoreutils-python-utils
@@ -20,12 +20,12 @@
     ansible_facts['distribution_major_version'] is version("8", ">=")
 
 - name: Ensure epel is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: epel-release
     state: installed
 
 - name: Ensure Tomcat Native library is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: tomcat-native
     state: installed
 

roles/tomcat/tasks/upgrade.yml

@@ -77,7 +77,6 @@
     mode: preserve
     remote_src: true
   loop: "{{ tomcat_items_to_restore }}"
-
   when: tomcat_check.stat.exists
   notify: Restart tomcat
 

roles/xnat/tasks/main.yml

@@ -8,7 +8,7 @@
     ansible_facts['distribution_major_version'] is version('8', '>=')
 
 - name: Ensure dependencies are installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name:
       - postgresql
       - wget

roles/xnat/tasks/plugins.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensure unzip is installed
-  ansible.builtin.dnf:
+  ansible.builtin.yum:
     name: unzip
     state: installed