Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "PMM-9769 update all components" #2463

Merged
merged 1 commit into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build/ansible/pmm2/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
- hosts: all
become: yes
gather_facts: yes
vars:
ansible_python_interpreter: /usr/bin/python3.9
roles:
- cloud-node
- lvm-init
Expand Down
4 changes: 2 additions & 2 deletions build/ansible/roles/cloud-node/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
- yum-utils
- cloud-init
- firewalld
- python3-libselinux
- python3-firewall
- python3-pip
- ansible

- name: Firewalld | Start
when: ansible_os_family == 'RedHat'
Expand Down
2 changes: 2 additions & 0 deletions build/ansible/roles/pmm2-images/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
yum:
name: "*"
state: latest
exclude: "ansible*"
disablerepo: percona-release-x86_64

- name: Packages | Install OS tools for EL7
Expand All @@ -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
Expand Down
21 changes: 13 additions & 8 deletions build/docker/server/Dockerfile.el9
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions build/packer/pmm2.el9.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down
12 changes: 12 additions & 0 deletions update/ansible/playbook/tasks/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading