Merge pull request #9 from fidanf/distro-upgrades

Distro upgrades: Ubuntu 20.04 and Debian 11 support

Author: fidanf

.travis.yml

@@ -10,8 +10,8 @@ env:
     - VAGRANT_DEFAULT_PROVIDER: libvirt
     - PY_COLORS: 1
   jobs:
-    - MOLECULE_DISTRO: generic/ubuntu1804
-    - MOLECULE_DISTRO: generic/debian10
+    - MOLECULE_DISTRO: generic/ubuntu2004
+    - MOLECULE_DISTRO: generic/debian11
 
 cache:
   directories:

README.md

@@ -5,6 +5,12 @@ PgPool
 
 Installs and configures PgPool-II for Debian/Ubuntu. The default _running mode_ is **streaming replication mode**.
 
+Tested with :
+  - Debian 10.x :heavy_check_mark:
+  - Debian 11.x :heavy_check_mark:
+  - Ubuntu 18.04.x :heavy_check_mark:
+  - Ubuntu 20.04.x :heavy_check_mark:
+
 - [PgPool](#pgpool)
   - [Requirements](#requirements)
   - [Role Variables](#role-variables)
@@ -18,8 +24,8 @@ Installs and configures PgPool-II for Debian/Ubuntu. The default _running mode_
 Requirements
 ------------
 
-Python >=3.6
-The role is compatible with Ansible >=2.10 but hasn't yet be tested with Ansible 3.x.
+- Python >=3.8
+- Ansible-core >=2.12
 
 See [./requirements.txt](./requirements.txt) for detailled dependencies used to develop the role.
 

molecule/default/molecule.yml

@@ -14,7 +14,7 @@ driver:
     name: libvirt
 platforms:
   - name: pgsql01
-    box: ${MOLECULE_DISTRO:-"generic/debian10"}
+    box: ${MOLECULE_DISTRO:-"generic/debian11"}
     groups:
       - pgpool
     config_options:
@@ -28,7 +28,7 @@ platforms:
         ip: 192.168.30.10
         auto_config: true
   - name: pgsql02
-    box: ${MOLECULE_DISTRO:-"generic/debian10"}
+    box: ${MOLECULE_DISTRO:-"generic/debian11"}
     config_options:
       ssh.keep_alive: yes
       ssh.remote_user: "'vagrant'"

molecule/default/prepare.yml

@@ -34,19 +34,22 @@
       when: hostvars[item].ansible_eth1.ipv4.address is defined
       loop: "{{ groups[repmgr_target_group] }}"
 
+    - name: Install acl package
+      apt: 
+        name: acl
+
   roles:
     - name: fidanf.postgresql_ha
       vars:
-        repmgr_version: 5.2
-        repmgr_version_debian: 5.2.1-1.pgdg100+1
+        repmgr_version: 5.3
         repmgr_master: pgsql01
         repmgr_target_group: pgpool
         repmgr_promote_command: /usr/bin/repmgr standby promote -f /etc/repmgr.conf --log-to-file
         repmgr_follow_command: /usr/bin/repmgr standby follow -f /etc/repmgr.conf --log-to-file --upstream-node-id=%n
         repmgr_monitoring_history: "yes"
         repmgr_connection_check_type: query
         repmgr_log_level: INFO
-        postgresql_version: 12
+        postgresql_version: 13
         postgresql_listen_addresses: "*"
         postgresql_port: 5432
         postgresql_max_connections: 128

molecule/default/requirements.yml

@@ -2,4 +2,4 @@
 roles:
   - src: https://github.com/fidanf/ansible-role-postgresql-ha
     name: fidanf.postgresql_ha
-    version: 2.4.2
+    version: 2.5.1

requirements.txt

@@ -1,14 +1,11 @@
-ansible>=2.10.7,<2.11.0
+ansible
 molecule
-molecule-vagrant==0.6.1
-pyyaml<6,>=5.1
+molecule-vagrant>=1.0.0
 ansible-lint
 yamllint
 python-vagrant
-docker
-docker-compose
 netaddr
-dnspython
 cryptography
 jsondiff
+pyyaml
 pyOpenSSL

vars/bionic.yml

@@ -3,4 +3,4 @@ ppgool_ping_path: /bin
 pgpool_if_cmd_path: /sbin
 pgpool_arping_path: /usr/sbin
 pgpool_systemctl_path: /bin
-pgpool_patch_rsyslog: true
+pgpool_patch_syslog: true

vars/bullseye.yml

@@ -0,0 +1,5 @@
+---
+ppgool_ping_path: /usr/bin
+pgpool_if_cmd_path: /usr/bin
+pgpool_arping_path: /usr/sbin
+pgpool_systemctl_path: /usr/bin

vars/focal.yml

@@ -3,4 +3,3 @@ ppgool_ping_path: /bin
 pgpool_if_cmd_path: /sbin
 pgpool_arping_path: /usr/sbin
 pgpool_systemctl_path: /bin
-pgpool_patch_rsyslog: true