From 2ed1e7f410090ba0decc024d93f8b9672a260c73 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Fri, 14 Feb 2025 16:00:41 +0500 Subject: [PATCH] PMM-7 Fix removal of default vagrant user. --- .../ansible/roles/pmm2-images/tasks/main.yml | 26 +++++++++---------- .../tasks/roles/postgres/tasks/main.yml | 24 ++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index db1c5ad018..53d07cbf29 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -151,18 +151,18 @@ - name: Install RPMs | Install RPMs for PMM2 server yum: name: - - percona-grafana-9.2.20-100.2410070653.6b522eb - - percona-victoriametrics-1.93.4-1 - - percona-qan-api2-2.43.2-17.2410251038.0c718e6 - - percona-dashboards-2.43.2-20.2410010753.3b2494f - - percona-alertmanager-0.25.0-3 - - pmm-managed-2.43.2-20.2410251035.0c718e6 - - pmm-update-2.43.2-67.2410251039.0c718e6 - - dbaas-controller-2.43.2-1.2410010805.9900837 - - dbaas-tools-0.6.10-2.2409270552 - - grafana-db-migrator-1.0.8-2 - - pmm-dump-2.43.2-1.2410111407.8b40b85 - - vmproxy-2.43.2-1.2410251041.0c718e6 + - percona-grafana-9.2.20-100.2410070653.6b522eb.el9 + - percona-victoriametrics-1.93.4-1.el9 + - percona-qan-api2-2.43.2-17.2410251038.0c718e6.el9 + - percona-dashboards-2.43.2-20.2410010753.3b2494f.el9 + - percona-alertmanager-0.25.0-3.el9 + - pmm-managed-2.43.2-20.2410251035.0c718e6.el9 + - pmm-update-2.43.2-67.2410251039.0c718e6.el9 + - dbaas-controller-2.43.2-1.2410010805.9900837.el9 + - dbaas-tools-0.6.10-2.2409270552.el9 + - grafana-db-migrator-1.0.8-2.el9 + - pmm-dump-2.43.2-1.2410111407.8b40b85.el9 + - vmproxy-2.43.2-1.2410251041.0c718e6.el9 state: installed # line below is sed'ed by build-server-docker script enablerepo: "pmm2-server" @@ -173,7 +173,7 @@ - name: Install RPMs | Install pmm2-client rpm yum: name: - - pmm2-client-2.43.2-6 + - pmm2-client-2.43.2-6.el9 state: installed enablerepo: "{{ pmm_client_repo_name }}" diff --git a/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml b/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml index 44ac073f4b..3752fb0aed 100644 --- a/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml +++ b/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml @@ -26,12 +26,12 @@ - not ansible_check_mode yum: name: - - percona-postgresql14-server-14.13-1 - - percona-postgresql11-contrib-11.22-1 - - percona-postgresql14-14.13-1 - - percona-postgresql11-server-11.22-1 - - percona-postgresql11-contrib-11.22-1 - - percona-postgresql11-11.22-1 + - percona-postgresql14-server-14.13-1.el9 + - percona-postgresql11-contrib-11.22-1.el9 + - percona-postgresql14-14.13-1.el9 + - percona-postgresql11-server-11.22-1.el9 + - percona-postgresql11-contrib-11.22-1.el9 + - percona-postgresql11-11.22-1.el9 - python-psycopg2 # Python PostgreSQL database adapter§ state: installed when: @@ -64,12 +64,12 @@ - not ansible_check_mode dnf: name: - - percona-postgresql14-server-14.13-1 - - percona-postgresql11-contrib-11.22-1 - - percona-postgresql14-14.13-1 - - percona-postgresql11-server-11.22-1 - - percona-postgresql11-contrib-11.22-1 - - percona-postgresql11-11.22-1 + - percona-postgresql14-server-14.13-1.el9 + - percona-postgresql11-contrib-11.22-1.el9 + - percona-postgresql14-14.13-1.el9 + - percona-postgresql11-server-11.22-1.el9 + - percona-postgresql11-contrib-11.22-1.el9 + - percona-postgresql11-11.22-1.el9 - python-psycopg2 # Python PostgreSQL database adapter§ state: installed when: