PMM-5885 Upgrade Postgres to 14

ansible/roles/pmm2-images/tasks/main.yml

@@ -18,6 +18,12 @@
         gpgcheck: no
         enabled: no
 
+    # we use it for pmm-client (TODO we'll need switch to pmm-client client repo)
+    - name: Packages                   | Install percona-release rpm
+      yum:
+        name: https://repo.percona.com/yum/percona-release-latest.noarch.rpm
+        state: installed
+
     - name: Packages                   | Update OS
       yum:
         name: '*'
@@ -65,12 +71,6 @@
             - { name: pmm-agent, uid: 996, comment: "pmm-agent", shell: "/bin/false", home: "/usr/local/percona/", group: pmm-agent }
       when: ansible_virtualization_type == "docker"
 
-    - name: Add user to group         | Add the user 'postgres' to group 'pmm'
-      user:
-        name: postgres
-        groups: pmm
-        append: yes
-
     - name: Create directories        | Create dirs
       file: path={{ item }} state=directory owner=pmm group=pmm
       with_items:
@@ -86,15 +86,6 @@
         group: pmm
         mode: '0775'
 
-    - name: PostgresDB                | Create Postgres log file
-      file:
-        path: /srv/logs/postgresql.log
-        state: touch
-        force: yes
-        group: postgres
-        owner: postgres
-        mode: 0644
-
     - name: Create dirs                | Create dirs
       when: ansible_virtualization_type == "docker"
       file: path={{ item }} state=directory
@@ -138,24 +129,10 @@
       when: ansible_virtualization_type != "docker"
       service: name=pmm-agent state=stopped enabled=no
 
-    - name: Supervisord               | Remove supervisord block from pmm.ini
-      when: ansible_virtualization_type != "docker"
-      ini_file:
-        path: /etc/supervisord.d/pmm.ini
-        section: supervisord
-        state: absent
-
     - name: Create tmp dirs           | Create tmp dirs
       when: ansible_virtualization_type != "docker"
       command: /usr/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
 
-    - name: Disable pmm-update-perform-init for build time
-      ini_file:
-        path: /etc/supervisord.d/pmm.ini
-        section: program:pmm-update-perform-init
-        option: autostart
-        value: "false"
-
     - name: Copy grafana.ini file for the first run
       copy:
         src: grafana.ini

packer/pmm2.json

@@ -121,7 +121,6 @@
             ],
             "role_paths": [
                 "ansible/roles/cloud-node",
-                "ansible/roles/postgres-init",
                 "ansible/roles/lvm-init",
                 "ansible/roles/pmm2-images",
                 "ansible/roles/supervisord-init",

rhel/SPECS/pmm-server.spec

@@ -7,7 +7,7 @@
 %global pmm_provider    github.com/percona/%{pmm_repo}
 %global pmm_commit      @@pmm_commit@@
 %global pmm_shortcommit %(c=%{pmm_commit}; echo ${c:0:7})
-%define release         30
+%define release         31
 %define rpm_release     %{release}.%{build_timestamp}.%{shortcommit}%{?dist}
 
 Name:		%{repo}
@@ -42,9 +42,6 @@ install -d %{buildroot}%{_datadir}/percona-dashboards
 
 mv alertmanager.yml %{buildroot}%{_sysconfdir}/alertmanager.yml
 
-install -d %{buildroot}%{_sysconfdir}/supervisord.d
-mv supervisord.conf %{buildroot}%{_sysconfdir}/supervisord.d/pmm.ini
-
 install -d %{buildroot}%{_datadir}/%{name}
 cp -pav ./entrypoint.sh %{buildroot}%{_datadir}/%{name}/entrypoint.sh
 cp -pav ./installation-wizard/build %{buildroot}%{_datadir}/%{name}/installation-wizard-page
@@ -55,12 +52,14 @@ rm -rf %{pmm_repo}-%{pmm_commit}
 %files
 %license LICENSE
 %doc README.md CHANGELOG.md
-%{_sysconfdir}/supervisord.d
 %{_sysconfdir}/alertmanager.yml
 %{_datadir}/%{name}
 
 
 %changelog
+* Mon May 31 2022 Nikita Beletskii <nikita.beletskii@percona.com> - 2.29.0-2
+- PMM-10027 Remove supervisor config from package
+
 * Mon May 16 2022 Nikita Beletskii <nikita.beletskii@percona.com> - 2.29.0-1
 - PMM-10027 remove useless packages