PMM-9769 update all components (#2478)

* PMM-9769 Use ansible-core instead of ansible package. * PMM-9769 Update all components.
percona · Sep 15, 2023 · 576142a · 576142a
1 parent 1cb518a
commit 576142a
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 24 deletions.
diff --git a/build/ansible/roles/ami-ovf/tasks/main.yml b/build/ansible/roles/ami-ovf/tasks/main.yml
@@ -31,12 +31,39 @@
     enabled: yes
     gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
 
-- name: Disable SELinux
+- name: Disable SELinux            | EL7
+  when:
+    - ansible_distribution == 'CentOS'
+    - ansible_distribution_major_version == '7'
   selinux:
     policy: targeted
     state: permissive
 
-- name: PMM                        | Add firewalld rule
+- name: Disable SELinux            | EL9
+  when:
+    - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+    - ansible_distribution_major_version == '9'
+  vars:
+    ansible_python_interpreter: /usr/bin/python3.9
+  selinux:
+    policy: targeted
+    state: permissive
+
+- name: Add firewalld rule        | EL7
+  when:
+    - ansible_distribution == 'CentOS'
+    - ansible_distribution_major_version == '7'
+  firewalld: port={{ item }} permanent=true state=enabled immediate=yes
+  with_items:
+    - 80/tcp
+    - 443/tcp
+
+- name: Add firewalld rule        | EL9
+  when:
+    - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+    - ansible_distribution_major_version == '9'
+  vars:
+    ansible_python_interpreter: /usr/bin/python3.9
   firewalld: port={{ item }} permanent=true state=enabled immediate=yes
   with_items:
     - 80/tcp

diff --git a/build/ansible/roles/cloud-node/tasks/main.yml b/build/ansible/roles/cloud-node/tasks/main.yml
@@ -38,11 +38,26 @@
       - yum-utils
       - cloud-init
       - firewalld
-      - python3-pip
-      - ansible
+      - python3-libselinux
+      - python3-firewall
+
+- name: Firewalld                  | Start EL7
+  when:
+    - ansible_distribution == 'CentOS'
+    - ansible_distribution_major_version == '7'
+    - ansible_os_family == 'RedHat'
+  service:
+    name: firewalld
+    state: started
+    enabled: yes
 
-- name: Firewalld                  | Start
-  when: ansible_os_family == 'RedHat'
+- name: Firewalld                  | Start EL9
+  when:
+    - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+    - ansible_distribution_major_version == '9'
+    - ansible_os_family == 'RedHat'
+  vars:
+    ansible_python_interpreter: /usr/bin/python3.9
   service:
     name: firewalld
     state: started

diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml
@@ -47,13 +47,25 @@
     state: installed
   ignore_errors: True
 
-- name: Packages                   | Update OS
+- name: Packages                   | Update OS EL7
+  when:
+    - ansible_distribution == "CentOS"
+    - ansible_distribution_major_version == "7"
   yum:
     name: "*"
     state: latest
     exclude: "ansible*"
     disablerepo: percona-release-x86_64
 
+- name: Packages                   | Update OS EL9
+  when:
+    - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+    - ansible_distribution_major_version == '9'
+  yum:
+    name: "*"
+    state: latest
+    disablerepo: percona-release-x86_64
+
 - name: Packages                   | Install OS tools for EL7
   when:
     - ansible_distribution == "CentOS"
@@ -70,7 +82,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
@@ -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
@@ -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
@@ -239,15 +239,21 @@
     - name: Wait for pmm-managed
       pause: seconds=10
 
-    - name: Update system packages
+    - name: Update system packages EL7
+      when:
+        - ansible_distribution == "CentOS"
+        - ansible_distribution_major_version == "7"
       yum:
         name: "*"
         state: latest
         security: yes
         exclude:
           - nginx*
 
-    - name: Updating only select packages
+    - name: Updating only select packages EL7
+      when:
+        - ansible_distribution == "CentOS"
+        - ansible_distribution_major_version == "7"
       yum:
         name: "{{ item }}"
         state: latest
@@ -258,6 +264,38 @@
         - sshpass
         - vi
 
+    - name: Remove ansible RPM if installed   | EL9
+      when:
+        - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+        - ansible_distribution_major_version == '9'
+      yum:
+        name: ansible
+        state: absent
+      ignore_errors: yes
+
+    - name: Install ansible-core RPM          | EL9
+      when:
+        - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+        - ansible_distribution_major_version == '9'
+      yum:
+        name:
+          - ansible-core
+          - ansible-collection-community-general
+          - ansible-collection-community-postgresql
+          - ansible-collection-ansible-posix
+        state: present
+
+    - name: Update system packages EL9
+      when:
+        - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux'
+        - ansible_distribution_major_version == '9'
+        - not ansible_check_mode
+      yum:
+        name: "*"
+        state: latest
+        exclude:
+          - nginx*
+
     - name: Install nginx
       include_role:
         name: nginx