Merge branch 'master' into master

.github/workflows/molecule.yml

@@ -22,15 +22,12 @@ jobs:
           - distro: debian11
             tag: latest
             namespace: geerlingguy
-          - distro: debian10
+          - distro: ubuntu2404
             tag: latest
             namespace: geerlingguy
           - distro: ubuntu2204
             tag: latest
             namespace: geerlingguy
-          - distro: ubuntu2004
-            tag: latest
-            namespace: geerlingguy
           - distro: rockylinux8
             tag: latest
             namespace: geerlingguy

.github/workflows/schedule_pg_ubuntu2004.yml → .github/workflows/schedule_pg_ubuntu2404.yml

@@ -1,5 +1,5 @@
 ---
-name: scheduled PostgreSQL (Ubuntu 20.04)
+name: scheduled PostgreSQL (Ubuntu 24.04)
 
 on:
   schedule:
@@ -29,4 +29,4 @@ jobs:
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"
-          IMAGE_DISTRO: ubuntu2004
+          IMAGE_DISTRO: ubuntu2404

README.md

@@ -88,8 +88,8 @@ It requires the installation of a consul in client mode on each application serv
 RedHat and Debian based distros (x86_64)
 
 ###### Supported Linux Distributions:
-- **Debian**: 10, 11, 12
-- **Ubuntu**: 20.04, 22.04
+- **Debian**: 11, 12
+- **Ubuntu**: 22.04, 24.04
 - **CentOS Stream**: 9
 - **Oracle Linux**: 8, 9
 - **Rocky Linux**: 8, 9
@@ -103,11 +103,10 @@ all supported PostgreSQL versions
 _Table of results of daily automated testing of cluster deployment:_
 | Distribution | Test result |
 |--------------|:----------:|
-| Debian 10    | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_debian10.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_debian10.yml) |
 | Debian 11    | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_debian11.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_debian11.yml) |
 | Debian 12    | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_debian11.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_debian12.yml) |
-| Ubuntu 20.04 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_ubuntu2004.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_ubuntu2004.yml) |
 | Ubuntu 22.04 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_ubuntu2204.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_ubuntu2204.yml) |
+| Ubuntu 24.04 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_ubuntu2204.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_ubuntu2404.yml) |
 | CentOS Stream 9 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_centosstream9.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_centosstream9.yml) |
 | Oracle Linux 8 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_oracle_linux8.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_oracle_linux8.yml) |
 | Oracle Linux 9 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_oracle_linux9.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_oracle_linux9.yml) |

add_balancer.yml

@@ -6,12 +6,6 @@
   any_errors_fatal: true
   gather_facts: true
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
       tags: always

add_pgnode.yml

@@ -9,12 +9,6 @@
     - ansible.builtin.import_tasks: roles/patroni/handlers/main.yml
 
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
       tags: always
@@ -122,6 +116,12 @@
         - firewall_enabled_at_boot | bool
       tags: firewall
 
+    - role: pre-checks
+      vars:
+        minimal_ansible_version: 2.11.0
+        timescale_minimal_pg_version: 12 # if enable_timescale is defined
+      tags: always
+
     - role: sysctl
       when:
         - new_node | default(false) | bool

balancers.yml

@@ -9,12 +9,6 @@
     vip_manager_disable: false # or 'true' for disable vip-manager service (if installed)
 
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
       tags: always

config_pgcluster.yml

@@ -3,12 +3,6 @@
   hosts: postgres_cluster
   gather_facts: true
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
 

consul.yml

@@ -8,12 +8,6 @@
   environment: "{{ proxy_env | default({}) }}"
 
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
       tags: always

deploy_pgcluster.yml

@@ -10,12 +10,6 @@
   environment: "{{ proxy_env | default({}) }}"
 
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
       tags: always
@@ -62,17 +56,10 @@
       tags: always
 
   tasks:
-    - name: Clean yum cache
-      ansible.builtin.command: yum clean all
-      when:
-        - ansible_os_family == "RedHat"
-        - ansible_distribution_major_version == '7'
-
     - name: Clean dnf cache
       ansible.builtin.command: dnf clean all
       when:
         - ansible_os_family == "RedHat"
-        - ansible_distribution_major_version is version('8', '>=')
 
     - name: Update apt cache
       ansible.builtin.apt:

etcd_cluster.yml

@@ -7,12 +7,6 @@
   gather_facts: true
 
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-      tags: always
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
       tags: always

files/requirements.txt

@@ -8,7 +8,6 @@ python-consul>=0.7.1
 click>=4.1
 prettytable>=0.7
 python-dateutil
-pysyncobj>=0.3.8
 psutil>=2.0.0
 ydiff>=1.2.0
 pexpect==4.9.0

group_vars/all

@@ -11,10 +11,17 @@ os_valid_distributions:
   - AlmaLinux
 
 os_minimum_versions:
-  RedHat: 7
-  CentOS: 7
+  RedHat: 8
+  CentOS: 8
   Rocky: 8.4
-  OracleLinux: 7
-  Ubuntu: 20.04
-  Debian: 10
   AlmaLinux: 8.3
+  OracleLinux: 8
+  Ubuntu: 22.04
+  Debian: 11
+
+# Set correct interpreter for ansible-core
+# Since ansible-core 2.17 (ansible 10 on pypi), ansible_python_interpreter wouldn't accept arguments anymore
+# See:
+# - https://github.com/ansible/ansible/issues/83476
+# - https://github.com/ansible/ansible/issues/83603
+ansible_python_interpreter: "{{ ansible_version['full'] is version('2.17', '>=') | ternary('/usr/bin/python3', '/usr/bin/env python3') }}"

inventory

@@ -56,7 +56,7 @@ ansible_ssh_port='22'
 ansible_user='root'
 ansible_ssh_pass='secretpassword'  # "sshpass" package is required for use "ansible_ssh_pass"
 #ansible_ssh_private_key_file=
-ansible_python_interpreter='/usr/bin/env python3'
+#ansible_python_interpreter='/usr/bin/env python3'
 
 [pgbackrest:vars]
 #ansible_user='postgres'

molecule/default/converge.yml

@@ -33,6 +33,16 @@
       delegate_to: localhost
       run_once: true # noqa run-once
 
+    # Consul package for OracleLinux missing in HashiCorp repository
+    # Only the installation of a binary file is supported
+    - name: "Set variables: 'consul_install_from_repo: false' and 'patroni_installation_method: pip'"
+      ansible.builtin.set_fact:
+        consul_install_from_repo: false  # whether to install consul from repository as opposed to installing the binary directly
+        patroni_installation_method: "pip"  # the "rpm" method is supported only for consul installed from the repository
+      when:
+        - dcs_type == "consul"
+        - ansible_distribution == "OracleLinux"
+
     - name: Set variables for custom PostgreSQL data and WAL directory test
       ansible.builtin.set_fact:
         postgresql_data_dir: "/pgdata/{{ postgresql_version }}/main"
@@ -41,9 +51,6 @@
     - name: Set variables for TimescaleDB cluster deployment test
       ansible.builtin.set_fact:
         enable_timescale: true
-      when:
-        - not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '<'))
-        - not (ansible_distribution == 'Debian' and ansible_distribution_version is version('11', '>')) # TODO Debian 12
 
     - name: Set variables for PostgreSQL Cluster update test
       ansible.builtin.set_fact:

molecule/pg_upgrade/converge.yml

@@ -22,17 +22,24 @@
       delegate_to: localhost
       run_once: true # noqa run-once
 
+    # Consul package for OracleLinux missing in HashiCorp repository
+    # Only the installation of a binary file is supported
+    - name: "Set variables: 'consul_install_from_repo: false' and 'patroni_installation_method: pip'"
+      ansible.builtin.set_fact:
+        consul_install_from_repo: false  # whether to install consul from repository as opposed to installing the binary directly
+        patroni_installation_method: "pip"  # the "rpm" method is supported only for consul installed from the repository
+      when:
+        - dcs_type == "consul"
+        - ansible_distribution == "OracleLinux"
+
     - name: Set variables for custom PostgreSQL data and WAL directory test
       ansible.builtin.set_fact:
         postgresql_data_dir: "/pgdata/{{ postgresql_version }}/main"
         postgresql_wal_dir: "/pgwal/{{ postgresql_version }}/pg_wal"
 
     - name: Set variables for TimescaleDB cluster deployment test
       ansible.builtin.set_fact:
-        enable_timescale: false # TODO (enable when adding PostgreSQL 16 support)
-      when:
-        - not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '<'))
-        - not (ansible_distribution == 'Debian' and ansible_distribution_version is version('11', '>')) # TODO Debian 12
+        enable_timescale: true
 
     - name: Set variables for PostgreSQL upgrade test
       ansible.builtin.set_fact:

pg_upgrade.yml

@@ -8,11 +8,6 @@
   become_user: postgres
   any_errors_fatal: true
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
 

pg_upgrade_rollback.yml

@@ -10,11 +10,6 @@
   gather_facts: true
   any_errors_fatal: true
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
     - name: Include upgrade variables

remove_cluster.yml

@@ -3,11 +3,6 @@
   hosts: postgres_cluster
   become: true
   pre_tasks:
-    - name: "Set variable: ansible_python_interpreter"
-      ansible.builtin.set_fact:
-        ansible_python_interpreter: "/usr/bin/env python3"
-      when: "'python3' not in (ansible_python_interpreter | default(''))"
-
     - name: Include main variables
       ansible.builtin.include_vars: "vars/main.yml"
     - name: Include OS-specific variables