From 74b771fa2db3993ecb9b94432f99b008647a13a4 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Thu, 24 Aug 2023 13:09:50 +0500 Subject: [PATCH 01/10] PMM-9769 Use ansible-core to buid AMI image. --- build/ansible/pmm2/main.yml | 2 ++ build/ansible/roles/cloud-node/tasks/main.yml | 2 -- 2 files changed, 2 insertions(+), 2 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..948d62b3cb 100644 --- a/build/ansible/roles/cloud-node/tasks/main.yml +++ b/build/ansible/roles/cloud-node/tasks/main.yml @@ -38,8 +38,6 @@ - yum-utils - cloud-init - firewalld - - python3-pip - - ansible - name: Firewalld | Start when: ansible_os_family == 'RedHat' From 75432f02f78c3f0d7626d86ac8190e034becb0bb Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Thu, 24 Aug 2023 20:11:32 +0500 Subject: [PATCH 02/10] PMM-9769 Use ansible-core to buid AMI image. --- build/ansible/roles/pmm2-images/tasks/main.yml | 5 ----- build/packer/pmm2.el9.json | 3 ++- update/ansible/playbook/tasks/update.yml | 12 ------------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index f7812a6328..de2c475738 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 @@ -68,10 +67,6 @@ - (ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux') and ansible_distribution_major_version == '9' yum: 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/packer/pmm2.el9.json b/build/packer/pmm2.el9.json index 51488569db..ccb60d6feb 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 python3-libselinux python3-firewall", + "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 df4cd7b7c2..d15cf64d4f 100644 --- a/update/ansible/playbook/tasks/update.yml +++ b/update/ansible/playbook/tasks/update.yml @@ -260,21 +260,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 From 8d02e5ee93efc16dc68d4af82b5cc3921bd3c81e Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Thu, 24 Aug 2023 20:29:40 +0500 Subject: [PATCH 03/10] PMM-9769 Use ansible-core to buid AMI image. --- build/ansible/roles/pmm2-images/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index de2c475738..54fbc4351f 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -67,6 +67,7 @@ - (ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux') and ansible_distribution_major_version == '9' yum: name: + - python3-pip - rsync - libsqlite3x-devel # package does not come pre-installed on EL9 From e7e2fc42eda6b7d676f78e0c57123575f3ca5931 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Thu, 24 Aug 2023 20:43:31 +0500 Subject: [PATCH 04/10] PMM-9769 Use ansible-core to buid AMI image. --- build/ansible/roles/pmm2-images/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index 54fbc4351f..0daf34fc92 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -68,6 +68,7 @@ yum: name: - python3-pip + - python3-psycopg2 - rsync - libsqlite3x-devel # package does not come pre-installed on EL9 From 6c4ada325cde578529e97d7bc5c9664eebf39548 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Thu, 24 Aug 2023 21:04:52 +0500 Subject: [PATCH 05/10] PMM-9769 Use ansible-core to buid AMI image. --- build/ansible/roles/pmm2-images/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index 0daf34fc92..0cbe720f88 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -68,7 +68,7 @@ yum: name: - python3-pip - - python3-psycopg2 + - python3.11-psycopg2 - rsync - libsqlite3x-devel # package does not come pre-installed on EL9 From 5004fbc54dd3a616c0701682f5e80e544d68668d Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Fri, 25 Aug 2023 09:06:51 +0500 Subject: [PATCH 06/10] PMM-9769 Use ansible-core to buid AMI image. --- build/ansible/roles/cloud-node/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/ansible/roles/cloud-node/tasks/main.yml b/build/ansible/roles/cloud-node/tasks/main.yml index 948d62b3cb..a0bc425670 100644 --- a/build/ansible/roles/cloud-node/tasks/main.yml +++ b/build/ansible/roles/cloud-node/tasks/main.yml @@ -38,6 +38,8 @@ - yum-utils - cloud-init - firewalld + - python3-libselinux + - python3-firewall - name: Firewalld | Start when: ansible_os_family == 'RedHat' From 1e9e67128d99544c08a7f598ecefd4bab11474f9 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Fri, 25 Aug 2023 09:07:17 +0500 Subject: [PATCH 07/10] PMM-9769 Use ansible-core to buid AMI image. --- build/packer/pmm2.el9.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/packer/pmm2.el9.json b/build/packer/pmm2.el9.json index ccb60d6feb..baa0ef18f2 100644 --- a/build/packer/pmm2.el9.json +++ b/build/packer/pmm2.el9.json @@ -114,7 +114,7 @@ "inline": [ "sudo yum -y update", "sudo yum -y install epel-release", - "sudo yum -y install ansible-core python3-libselinux python3-firewall", + "sudo yum -y install ansible-core", "sudo yum -y install ansible-collection-community-general ansible-collection-community-postgresql ansible-collection-ansible-posix" ] }, From cfed5384ad68b2ab8830761820045b7625a74c73 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Fri, 25 Aug 2023 09:29:40 +0500 Subject: [PATCH 08/10] PMM-9769 Use ansible-core to buid docker image. --- build/docker/server/Dockerfile.el9 | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) 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 From 025e0b7b4bfda4191b45d9235de9d87b7f4c2e8f Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Fri, 25 Aug 2023 10:21:38 +0500 Subject: [PATCH 09/10] PMM-9769 Use ansible-core to buid docker image. --- build/ansible/roles/pmm2-images/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index 0cbe720f88..a140221ec1 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -67,7 +67,7 @@ - (ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux') and ansible_distribution_major_version == '9' yum: name: - - python3-pip + - python3.11-pip - python3.11-psycopg2 - rsync - libsqlite3x-devel # package does not come pre-installed on EL9 From 8fb606a638f3b6cb15d1800743e873b7fc5c24d6 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Fri, 25 Aug 2023 11:06:50 +0500 Subject: [PATCH 10/10] PMM-9769 Use ansible-core to buid docker image. --- build/ansible/roles/pmm2-images/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index a140221ec1..45defa8d11 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -67,6 +67,7 @@ - (ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux') and ansible_distribution_major_version == '9' yum: name: + - python3-pip - python3.11-pip - python3.11-psycopg2 - rsync