diff --git a/build/ansible/pmm2/main.yml b/build/ansible/pmm2/main.yml index 01da526659..d830e37159 100644 --- a/build/ansible/pmm2/main.yml +++ b/build/ansible/pmm2/main.yml @@ -5,8 +5,6 @@ - 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 a0bc425670..edcbe3104d 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-libselinux - - python3-firewall + - python3-pip + - ansible - 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 45defa8d11..f7812a6328 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -51,6 +51,7 @@ yum: name: "*" state: latest + exclude: "ansible*" disablerepo: percona-release-x86_64 - name: Packages | Install OS tools for EL7 @@ -69,6 +70,7 @@ 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 4fb9001f98..925e4e6c08 100644 --- a/build/docker/server/Dockerfile.el9 +++ b/build/docker/server/Dockerfile.el9 @@ -18,14 +18,19 @@ EXPOSE 80 443 WORKDIR /opt -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 +# 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 COPY RPMS /tmp/RPMS COPY gitCommit /tmp/gitCommit diff --git a/build/packer/pmm2.el9.json b/build/packer/pmm2.el9.json index baa0ef18f2..51488569db 100644 --- a/build/packer/pmm2.el9.json +++ b/build/packer/pmm2.el9.json @@ -114,8 +114,7 @@ "inline": [ "sudo yum -y update", "sudo yum -y install epel-release", - "sudo yum -y install ansible-core", - "sudo yum -y install ansible-collection-community-general ansible-collection-community-postgresql ansible-collection-ansible-posix" + "sudo yum -y install ansible" ] }, { diff --git a/update/ansible/playbook/tasks/update.yml b/update/ansible/playbook/tasks/update.yml index 7ed5197432..db484e0cae 100644 --- a/update/ansible/playbook/tasks/update.yml +++ b/update/ansible/playbook/tasks/update.yml @@ -243,9 +243,21 @@ 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