From 3d65cad7b7d03320b0cc5c35f36541410ed47d6b Mon Sep 17 00:00:00 2001
From: Talha Bin Rizwan <talha.rizwan@percona.com>
Date: Tue, 5 Sep 2023 16:31:02 +0500
Subject: [PATCH] PMM-9769 update all components (#2446)

---
 build/ansible/pmm2/main.yml                   |  2 ++
 build/ansible/roles/cloud-node/tasks/main.yml |  4 ++--
 .../ansible/roles/pmm2-images/tasks/main.yml  |  2 --
 build/docker/server/Dockerfile.el9            | 21 +++++++------------
 build/packer/pmm2.el9.json                    |  3 ++-
 update/ansible/playbook/tasks/update.yml      | 12 -----------
 6 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/build/ansible/pmm2/main.yml b/build/ansible/pmm2/main.yml
index d830e37159..01da526659 100644
--- a/build/ansible/pmm2/main.yml
+++ b/build/ansible/pmm2/main.yml
@@ -5,6 +5,8 @@
 - hosts: all
   become: yes
   gather_facts: yes
+  vars:
+    ansible_python_interpreter: /usr/bin/python3.9
   roles:
     - cloud-node
     - lvm-init
diff --git a/build/ansible/roles/cloud-node/tasks/main.yml b/build/ansible/roles/cloud-node/tasks/main.yml
index edcbe3104d..a0bc425670 100644
--- a/build/ansible/roles/cloud-node/tasks/main.yml
+++ b/build/ansible/roles/cloud-node/tasks/main.yml
@@ -38,8 +38,8 @@
       - yum-utils
       - cloud-init
       - firewalld
-      - python3-pip
-      - ansible
+      - python3-libselinux
+      - python3-firewall
 
 - name: Firewalld                  | Start
   when: ansible_os_family == 'RedHat'
diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml
index f7812a6328..45defa8d11 100644
--- a/build/ansible/roles/pmm2-images/tasks/main.yml
+++ b/build/ansible/roles/pmm2-images/tasks/main.yml
@@ -51,7 +51,6 @@
   yum:
     name: "*"
     state: latest
-    exclude: "ansible*"
     disablerepo: percona-release-x86_64
 
 - name: Packages                   | Install OS tools for EL7
@@ -70,7 +69,6 @@
     name:
       - python3-pip
       - python3.11-pip
-      - python3.11
       - python3.11-psycopg2
       - rsync
       - libsqlite3x-devel # package does not come pre-installed on EL9
diff --git a/build/docker/server/Dockerfile.el9 b/build/docker/server/Dockerfile.el9
index 925e4e6c08..4fb9001f98 100644
--- a/build/docker/server/Dockerfile.el9
+++ b/build/docker/server/Dockerfile.el9
@@ -18,19 +18,14 @@ EXPOSE 80 443
 
 WORKDIR /opt
 
-# NOTE: Ansible should NOT be installed via yum/dnf
-# Read more: https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#pip-install
-# RUN microdnf -y install yum && yum -y install python3-pip && \
-#     yum -y install oracle-epel-release-el9 ansible-core && \
-#     python3 -m pip install ansible && \
-#     python3 -m pip install setuptools && \
-#     yum -y install epel-release
-
-RUN microdnf -y install yum && yum -y install python3-pip && \
-  yum -y install oracle-epel-release-el9 ansible-core && \
-  yum -y install epel-release && \
-  yum -y install glibc-langpack-en && \
-  yum -y install ansible vi
+RUN microdnf -y install epel-release && \
+    microdnf -y install ansible-core \
+                        ansible-collection-community-general \
+                        ansible-collection-community-postgresql \
+                        ansible-collection-ansible-posix \
+                        glibc-langpack-en \
+                        yum \
+                        vi
 
 COPY RPMS /tmp/RPMS
 COPY gitCommit /tmp/gitCommit
diff --git a/build/packer/pmm2.el9.json b/build/packer/pmm2.el9.json
index 51488569db..baa0ef18f2 100644
--- a/build/packer/pmm2.el9.json
+++ b/build/packer/pmm2.el9.json
@@ -114,7 +114,8 @@
       "inline": [
         "sudo yum -y update",
         "sudo yum -y install epel-release",
-        "sudo yum -y install ansible"
+        "sudo yum -y install ansible-core",
+        "sudo yum -y install ansible-collection-community-general ansible-collection-community-postgresql ansible-collection-ansible-posix"
       ]
     },
     {
diff --git a/update/ansible/playbook/tasks/update.yml b/update/ansible/playbook/tasks/update.yml
index db484e0cae..7ed5197432 100644
--- a/update/ansible/playbook/tasks/update.yml
+++ b/update/ansible/playbook/tasks/update.yml
@@ -243,21 +243,9 @@
       yum:
         name: "*"
         state: latest
-        security: yes
         exclude:
           - nginx*
 
-    - name: Updating only select packages
-      yum:
-        name: "{{ item }}"
-        state: latest
-      loop:
-        - nss
-        - tzdata
-        - libssh2
-        - sshpass
-        - vi
-
     - name: Install nginx
       include_role:
         name: nginx