diff --git a/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/0003-Adjust-puppetlabs-postgresql-version-requirement.patch b/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/0003-Adjust-puppetlabs-postgresql-version-requirement.patch new file mode 100644 index 000000000..a857d9ee0 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/0003-Adjust-puppetlabs-postgresql-version-requirement.patch @@ -0,0 +1,43 @@ +From 64878063dd63cb0afd8b437554450b84fcc41604 Mon Sep 17 00:00:00 2001 +From: Matheus Guilhermino +Date: Fri, 27 May 2022 15:38:50 +0000 +Subject: [PATCH] Adjust puppetlabs-postgresql version requirement + +As can be verified on the module's changelog, support for Debian 11 was +added on puppetlabs-postgresql v7.4.0, which is already out of the +specified range. + +Other than added functionality and fixes, here are the major changes +between v6.10.2(latest version inside of range) and v8.0.0: +v7.0.0 drops support for SLES 11 and RHEL 5, and bumps minimum Puppet +version to 6.0.0 (We are currently using Puppet 5.5.22, but it should +be noted that the minimal version was bumped up because Puppet 5 was +removed from the test cases and not because there are signs of +malfunction). +v8.0.0 drops support for CentOS 6, Debian 6, and Ubuntu 10, which is not +a problem since we are not using any of those OSs. + +In conclusion, any version earlier than v7.4.0 should not be used and +there are no known disadvantages to using v8.0.0 instead of v7.4.0. + +Signed-off-by: Matheus Guilhermino +--- + metadata.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/metadata.json b/metadata.json +index f26057f..6cb103f 100644 +--- a/metadata.json ++++ b/metadata.json +@@ -23,7 +23,7 @@ + }, + { + "name": "puppetlabs/postgresql", +- "version_requirement": ">=6.4.0 <7.0.0" ++ "version_requirement": ">=6.4.0 <=8.0.0" + } + ], + "description": "Puppet module library to expose common functionality between OpenStack modules.", +-- +2.30.2 + diff --git a/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/series b/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/series index a9f755647..d78a75554 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/series +++ b/config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/series @@ -1,2 +1,3 @@ 0001-Adapt-first-set-of-legacy-patches.patch 0002-Replace-deprecated-hiera-function.patch +0003-Adjust-puppetlabs-postgresql-version-requirement.patch diff --git a/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/meta_data.yaml b/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/meta_data.yaml new file mode 100644 index 000000000..efdfd0ac9 --- /dev/null +++ b/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/meta_data.yaml @@ -0,0 +1,11 @@ +--- +debname: puppet-module-puppetlabs-mysql +debver: 8.1.0-5 +dl_path: + name: puppet-module-puppetlabs-mysql-8.1.0-5.tar.gz + url: https://salsa.debian.org/puppet-team/puppet-module-puppetlabs-mysql/-/archive/debian/8.1.0-5/puppet-module-puppetlabs-mysql-debian-8.1.0-5.tar.gz + md5sum: 76d6c1b74c73057dc45434d18b484406 + sha256sum: 1136f9e0fb010533c685b610644861e00e49efe97e23d927f870ed9129519f3a +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/patches/0001-Adjust-puppetlabs-translate-version-requirement.patch b/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/patches/0001-Adjust-puppetlabs-translate-version-requirement.patch new file mode 100644 index 000000000..dfe8a9518 --- /dev/null +++ b/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/patches/0001-Adjust-puppetlabs-translate-version-requirement.patch @@ -0,0 +1,33 @@ +From c42de25c1785fdf5b5f6e3ec585d1fc045137e34 Mon Sep 17 00:00:00 2001 +From: Matheus Guilhermino +Date: Sat, 28 May 2022 03:45:38 +0000 +Subject: [PATCH] Adjust puppetlabs-translate version requirement + +puppetlabs-translate v2.0.0 removes support for Debian 7 and bumps up +the minimum Puppet version (both of those are irrelevant here since we +are on Debian 11 and the Puppet version is still inside the range). +All other changes introduced from v2.0.0 to v2.2.0 are added support +and minor fixes. +Therefore, it should be safe to use v2.2.0 without a problem. + +Signed-off-by: Matheus Guilhermino +--- + metadata.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/metadata.json b/metadata.json +index 1d6c4a9..f8972e1 100644 +--- a/metadata.json ++++ b/metadata.json +@@ -14,7 +14,7 @@ + }, + { + "name": "puppetlabs/translate", +- "version_requirement": ">= 1.0.0 < 2.0.0" ++ "version_requirement": ">= 1.0.0 <= 2.2.0" + } + ], + "data_provider": null, +-- +2.30.2 + diff --git a/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/patches/series b/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/patches/series new file mode 100644 index 000000000..dfcf9683c --- /dev/null +++ b/config/puppet-modules/puppetlabs-mysql-8.1.0/debian/patches/series @@ -0,0 +1 @@ +0001-Adjust-puppetlabs-translate-version-requirement.patch diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 9a145d75e..47e154ba6 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -25,6 +25,7 @@ config/puppet-modules/puppet-drbd-0.5.2 config/puppet-modules/puppet-etcd-1.12.3 config/puppet-modules/puppetlabs-firewall-1.12.0 config/puppet-modules/puppetlabs-haproxy-2.1.0 +config/puppet-modules/puppetlabs-mysql-8.1.0 config/puppet-modules/puppetlabs-postgresql-8.0.0 config/puppet-modules/puppetlabs-stdlib-5.0.0 config/puppet-modules/puppet-ldap