From 0de14da72abc6fed8ff4a82c1cd213a395f4a537 Mon Sep 17 00:00:00 2001 From: Shaun Thomas Date: Thu, 26 Oct 2023 12:46:04 -0500 Subject: [PATCH] Added support for Ubuntu22. Given that edb-ansible supports Ubuntu20, Ubuntu22 should also be compatible. I didn't physically test every single role, but have worked extensively with install_dbserver, setup_patroni, and setup_etcd, which are all necessary to set up a basic Patroni cluster. None of these were affected simply by adding "Ubuntu22" as a patch, which was necessary for various unrelated tests. --- roles/execute_binary_upgrade/defaults/main.yml | 1 + roles/init_dbserver/defaults/main.yml | 1 + roles/install_dbserver/defaults/main.yml | 1 + roles/install_dbserver/tasks/install_dbserver.yml | 2 +- roles/manage_dbpatches/README.md | 2 +- roles/manage_dbpatches/defaults/main.yml | 1 + roles/manage_efm/README.md | 2 +- roles/manage_efm/defaults/main.yml | 1 + roles/manage_pgbouncer/README.md | 2 +- roles/manage_pgbouncer/defaults/main.yml | 1 + roles/manage_pgpool2/defaults/main.yml | 1 + roles/setup_barman/defaults/main.yml | 1 + roles/setup_barmanserver/defaults/main.yml | 1 + roles/setup_efm/README.md | 2 +- roles/setup_efm/defaults/main.yml | 1 + roles/setup_etcd/README.md | 2 +- roles/setup_etcd/defaults/main.yml | 1 + roles/setup_fio/defaults/main.yml | 1 + roles/setup_hammerdb/defaults/main.yml | 1 + roles/setup_patroni/README.md | 2 +- roles/setup_patroni/defaults/main.yml | 1 + roles/setup_pemagent/defaults/main.yml | 1 + roles/setup_pemserver/defaults/main.yml | 1 + roles/setup_pgbackrest/defaults/main.yml | 1 + roles/setup_pgbackrestserver/defaults/main.yml | 1 + roles/setup_pgbouncer/defaults/main.yml | 1 + roles/setup_pgpool2/defaults/main.yml | 1 + roles/setup_replication/README.md | 2 +- roles/setup_replication/defaults/main.yml | 1 + roles/setup_repmgr/defaults/main.yml | 1 + roles/setup_repo/defaults/main.yml | 1 + roles/setup_repo/tasks/setup_repo.yml | 2 +- 32 files changed, 32 insertions(+), 9 deletions(-) diff --git a/roles/execute_binary_upgrade/defaults/main.yml b/roles/execute_binary_upgrade/defaults/main.yml index 0e92b2fbe..f3d868aba 100644 --- a/roles/execute_binary_upgrade/defaults/main.yml +++ b/roles/execute_binary_upgrade/defaults/main.yml @@ -52,6 +52,7 @@ supported_os: - RedHat8 - RedHat9 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/init_dbserver/defaults/main.yml b/roles/init_dbserver/defaults/main.yml index c6844fdda..0eb834eaa 100644 --- a/roles/init_dbserver/defaults/main.yml +++ b/roles/init_dbserver/defaults/main.yml @@ -110,6 +110,7 @@ supported_os: - RedHat8 - RedHat9 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/install_dbserver/defaults/main.yml b/roles/install_dbserver/defaults/main.yml index 3794b8029..0213d1743 100644 --- a/roles/install_dbserver/defaults/main.yml +++ b/roles/install_dbserver/defaults/main.yml @@ -39,6 +39,7 @@ supported_os: - RedHat8 - RedHat9 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/install_dbserver/tasks/install_dbserver.yml b/roles/install_dbserver/tasks/install_dbserver.yml index ad973b71b..fad21e29f 100644 --- a/roles/install_dbserver/tasks/install_dbserver.yml +++ b/roles/install_dbserver/tasks/install_dbserver.yml @@ -22,7 +22,7 @@ pg_type == 'EPAS' and ((pg_version|int < 12 and os in ['RedHat8','CentOS8','Rocky8','AlmaLinux8']) or (pg_version|int < 11 and os in ['Ubuntu18', 'Debian9']) or - (pg_version|int < 13 and os in ['Ubuntu20']) or + (pg_version|int < 13 and os in ['Ubuntu20', 'Ubuntu22']) or (pg_version|int < 12 and os in ['Debian10'])) - name: Remove Postgres packages diff --git a/roles/manage_dbpatches/README.md b/roles/manage_dbpatches/README.md index ae005b955..ec29e90b6 100644 --- a/roles/manage_dbpatches/README.md +++ b/roles/manage_dbpatches/README.md @@ -24,7 +24,7 @@ When executing the role via ansible these are the required variables: * ***os*** - Operating Systems supported are: CentOS7, CentOS8, RHEL7, RHEL8, Rocky8, AlmaLinux8, Debian10 and Ubuntu20 + Operating Systems supported are: CentOS7, CentOS8, RHEL7, RHEL8, Rocky8, AlmaLinux8, Debian10, Ubuntu20, and Ubuntu22 The rest of the variables can be configured and are available in the: diff --git a/roles/manage_dbpatches/defaults/main.yml b/roles/manage_dbpatches/defaults/main.yml index fcbc2e6a7..56bb5513f 100644 --- a/roles/manage_dbpatches/defaults/main.yml +++ b/roles/manage_dbpatches/defaults/main.yml @@ -60,6 +60,7 @@ supported_os: - RedHat7 - RedHat8 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/manage_efm/README.md b/roles/manage_efm/README.md index dd7fe502d..e0199be92 100644 --- a/roles/manage_efm/README.md +++ b/roles/manage_efm/README.md @@ -42,7 +42,7 @@ When executing the role via ansible there are three required variables: * ***os*** - Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, Debian10, Ubuntu20 and AlmaLinux8 + Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, Debian10, Ubuntu20, Ubuntu22, and AlmaLinux8 * ***pg_version*** diff --git a/roles/manage_efm/defaults/main.yml b/roles/manage_efm/defaults/main.yml index 9edecc45a..cf7927b43 100644 --- a/roles/manage_efm/defaults/main.yml +++ b/roles/manage_efm/defaults/main.yml @@ -50,6 +50,7 @@ supported_os: - RedHat7 - RedHat8 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/manage_pgbouncer/README.md b/roles/manage_pgbouncer/README.md index 23df03a2d..3cca0c7d4 100644 --- a/roles/manage_pgbouncer/README.md +++ b/roles/manage_pgbouncer/README.md @@ -16,7 +16,7 @@ When executing the role via ansible these are the required variables: * ***os*** - Operating Systems supported are: CentOS7, CentOS8, RHEL7, RHEL8, Rocky8, Ubuntu20, Debian10 and AlmaLinux8 + Operating Systems supported are: CentOS7, CentOS8, RHEL7, RHEL8, Rocky8, Ubuntu20, Ubuntu22, Debian10 and AlmaLinux8 The rest of the variables can be configured and are available in the: diff --git a/roles/manage_pgbouncer/defaults/main.yml b/roles/manage_pgbouncer/defaults/main.yml index 844a1a0a5..c5a7827ae 100644 --- a/roles/manage_pgbouncer/defaults/main.yml +++ b/roles/manage_pgbouncer/defaults/main.yml @@ -21,3 +21,4 @@ supported_os: - Debian10 - OracleLinux7 - Ubuntu20 + - Ubuntu22 diff --git a/roles/manage_pgpool2/defaults/main.yml b/roles/manage_pgpool2/defaults/main.yml index 679c23d6f..4f9df7452 100644 --- a/roles/manage_pgpool2/defaults/main.yml +++ b/roles/manage_pgpool2/defaults/main.yml @@ -19,6 +19,7 @@ supported_os: - AlmaLinux8 - OracleLinux7 - Ubuntu20 + - Ubuntu22 - Debian10 supported_pg_version: diff --git a/roles/setup_barman/defaults/main.yml b/roles/setup_barman/defaults/main.yml index 94855ead6..97f3bca60 100644 --- a/roles/setup_barman/defaults/main.yml +++ b/roles/setup_barman/defaults/main.yml @@ -33,3 +33,4 @@ supported_os: - AlmaLinux8 - OracleLinux7 - Ubuntu20 + - Ubuntu22 diff --git a/roles/setup_barmanserver/defaults/main.yml b/roles/setup_barmanserver/defaults/main.yml index 0468a892f..666a29d06 100644 --- a/roles/setup_barmanserver/defaults/main.yml +++ b/roles/setup_barmanserver/defaults/main.yml @@ -34,3 +34,4 @@ supported_os: - AlmaLinux8 - OracleLinux7 - Ubuntu20 + - Ubuntu22 diff --git a/roles/setup_efm/README.md b/roles/setup_efm/README.md index 53efd5a74..8d16a628d 100644 --- a/roles/setup_efm/README.md +++ b/roles/setup_efm/README.md @@ -41,7 +41,7 @@ When executing the role via ansible there are three required variables: * ***os*** - Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, Debian10, Ubuntu20 and AlmaLinux8 + Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, Debian10, Ubuntu20, Ubuntu22, and AlmaLinux8 * ***pg_version*** diff --git a/roles/setup_efm/defaults/main.yml b/roles/setup_efm/defaults/main.yml index d304a9e4d..b003480e7 100644 --- a/roles/setup_efm/defaults/main.yml +++ b/roles/setup_efm/defaults/main.yml @@ -115,6 +115,7 @@ supported_os: - RedHat7 - RedHat8 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/setup_etcd/README.md b/roles/setup_etcd/README.md index 96eb2493b..2741d6cbd 100644 --- a/roles/setup_etcd/README.md +++ b/roles/setup_etcd/README.md @@ -26,7 +26,7 @@ When executing the role via ansible there are three required variables: * ***os*** - Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, AlmaLinux8, Debian10 and Ubuntu20 + Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, AlmaLinux8, Debian10, Ubuntu20, and Ubuntu22 * ***pg_version*** diff --git a/roles/setup_etcd/defaults/main.yml b/roles/setup_etcd/defaults/main.yml index 25c3eef74..1f1fdc631 100644 --- a/roles/setup_etcd/defaults/main.yml +++ b/roles/setup_etcd/defaults/main.yml @@ -77,6 +77,7 @@ supported_os: - RedHat7 - RedHat8 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/setup_fio/defaults/main.yml b/roles/setup_fio/defaults/main.yml index b1bbbdd2e..7a6d1f42b 100644 --- a/roles/setup_fio/defaults/main.yml +++ b/roles/setup_fio/defaults/main.yml @@ -17,6 +17,7 @@ supported_os: - Debian10 - OracleLinux8 - Ubuntu20 + - Ubuntu22 use_patroni: false diff --git a/roles/setup_hammerdb/defaults/main.yml b/roles/setup_hammerdb/defaults/main.yml index 80a35dc1e..d57103e98 100644 --- a/roles/setup_hammerdb/defaults/main.yml +++ b/roles/setup_hammerdb/defaults/main.yml @@ -35,6 +35,7 @@ supported_os: - Debian10 - OracleLinux8 - Ubuntu20 + - Ubuntu22 use_patroni: false diff --git a/roles/setup_patroni/README.md b/roles/setup_patroni/README.md index 2d9dbf59c..ef43535cf 100644 --- a/roles/setup_patroni/README.md +++ b/roles/setup_patroni/README.md @@ -29,7 +29,7 @@ When executing the role via ansible there are three required variables: ### os -Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, AlmaLinux8, Debian10 and Ubuntu20 +Operating Systems supported are: CentOS7, RHEL7, CentOS8, RHEL8, AlmaLinux8, Debian10, Ubuntu20, and Ubuntu22 ### pg_version diff --git a/roles/setup_patroni/defaults/main.yml b/roles/setup_patroni/defaults/main.yml index c2822f34b..88ed729c3 100644 --- a/roles/setup_patroni/defaults/main.yml +++ b/roles/setup_patroni/defaults/main.yml @@ -151,6 +151,7 @@ supported_os: - RedHat7 - RedHat8 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/setup_pemagent/defaults/main.yml b/roles/setup_pemagent/defaults/main.yml index 6ce2341f0..b844d1d47 100644 --- a/roles/setup_pemagent/defaults/main.yml +++ b/roles/setup_pemagent/defaults/main.yml @@ -60,6 +60,7 @@ supported_os: - OracleLinux7 - Debian10 - Ubuntu20 + - Ubuntu22 supported_pg_type: - EPAS diff --git a/roles/setup_pemserver/defaults/main.yml b/roles/setup_pemserver/defaults/main.yml index cd08ef0ab..3e011e9d8 100644 --- a/roles/setup_pemserver/defaults/main.yml +++ b/roles/setup_pemserver/defaults/main.yml @@ -74,6 +74,7 @@ supported_os: - OracleLinux7 - Debian10 - Ubuntu20 + - Ubuntu22 supported_pg_type: - EPAS diff --git a/roles/setup_pgbackrest/defaults/main.yml b/roles/setup_pgbackrest/defaults/main.yml index 695b7ace5..d747e9302 100644 --- a/roles/setup_pgbackrest/defaults/main.yml +++ b/roles/setup_pgbackrest/defaults/main.yml @@ -36,3 +36,4 @@ supported_os: - AlmaLinux8 - Debian10 - Ubuntu20 + - Ubuntu22 diff --git a/roles/setup_pgbackrestserver/defaults/main.yml b/roles/setup_pgbackrestserver/defaults/main.yml index 9f61e4eb4..2549afc2a 100644 --- a/roles/setup_pgbackrestserver/defaults/main.yml +++ b/roles/setup_pgbackrestserver/defaults/main.yml @@ -64,6 +64,7 @@ supported_os: - AlmaLinux8 - Debian10 - Ubuntu20 + - Ubuntu22 supported_log_level: - 'off' diff --git a/roles/setup_pgbouncer/defaults/main.yml b/roles/setup_pgbouncer/defaults/main.yml index 4781ed345..377903768 100644 --- a/roles/setup_pgbouncer/defaults/main.yml +++ b/roles/setup_pgbouncer/defaults/main.yml @@ -76,3 +76,4 @@ supported_os: - Debian10 - OracleLinux7 - Ubuntu20 + - Ubuntu22 diff --git a/roles/setup_pgpool2/defaults/main.yml b/roles/setup_pgpool2/defaults/main.yml index 887b435ba..5d18ed114 100644 --- a/roles/setup_pgpool2/defaults/main.yml +++ b/roles/setup_pgpool2/defaults/main.yml @@ -67,6 +67,7 @@ supported_os: - AlmaLinux8 - OracleLinux7 - Ubuntu20 + - Ubuntu22 - Debian10 supported_pg_version: diff --git a/roles/setup_replication/README.md b/roles/setup_replication/README.md index a0ee2b602..51ae610c7 100644 --- a/roles/setup_replication/README.md +++ b/roles/setup_replication/README.md @@ -23,7 +23,7 @@ When executing the role via ansible there are three required variables: * ***os*** - Operating Systems supported are: CentOS7, CentOS8, RHEL7, RHEL8, Rocky8, AlmaLinux8, Debian9, Debian10 and Ubuntu20 + Operating Systems supported are: CentOS7, CentOS8, RHEL7, RHEL8, Rocky8, AlmaLinux8, Debian9, Debian10, Ubuntu20, and Ubuntu22 * ***pg_version*** diff --git a/roles/setup_replication/defaults/main.yml b/roles/setup_replication/defaults/main.yml index 2057d82ab..bed630349 100644 --- a/roles/setup_replication/defaults/main.yml +++ b/roles/setup_replication/defaults/main.yml @@ -67,6 +67,7 @@ supported_os: - RedHat8 - RedHat9 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/setup_repmgr/defaults/main.yml b/roles/setup_repmgr/defaults/main.yml index 44b3acbae..2a98f7c0f 100644 --- a/roles/setup_repmgr/defaults/main.yml +++ b/roles/setup_repmgr/defaults/main.yml @@ -52,6 +52,7 @@ supported_os: - RedHat8 - RedHat9 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/setup_repo/defaults/main.yml b/roles/setup_repo/defaults/main.yml index ef22af2c8..447ebb17f 100644 --- a/roles/setup_repo/defaults/main.yml +++ b/roles/setup_repo/defaults/main.yml @@ -91,6 +91,7 @@ supported_os: - RedHat8 - RedHat9 - Ubuntu20 + - Ubuntu22 - Debian9 - Debian10 - Rocky8 diff --git a/roles/setup_repo/tasks/setup_repo.yml b/roles/setup_repo/tasks/setup_repo.yml index b0d5c58f8..9c3fcf305 100644 --- a/roles/setup_repo/tasks/setup_repo.yml +++ b/roles/setup_repo/tasks/setup_repo.yml @@ -22,7 +22,7 @@ pg_type == 'EPAS' and ( pg_version|int < 12 and os in ['RedHat8','CentOS8', 'Rocky8', 'AlmaLinux8'] or pg_version|int < 11 and os in ['Ubuntu18', 'Debian9'] or - pg_version|int < 13 and os in ['Ubuntu20'] or + pg_version|int < 13 and os in ['Ubuntu20', 'Ubuntu22'] or pg_version|int < 12 and os in ['Debian10'] ) - name: Validate Credentials