From 7a094af9d56e05d5ef15bbc41978d376818b8150 Mon Sep 17 00:00:00 2001
From: Matheus Machado Guilhermino <Matheus.MachadoGuilhermino@windriver.com>
Date: Mon, 14 Mar 2022 15:29:58 -0300
Subject: [PATCH] Address unmet dependency in puppet-etcd-1.12.3

The following dependency was generating a
"unresolved dependency" warning during bootstrap on Debian:

puppet-stdlib (>= 4.6.0 < 5.0.0)

Debian is currently using puppet-stdlib 5.0.0 and the
most recent version of puppet-etcd asks for puppet-stdlib
(>= 4.6.0 < 5.0.0).
puppet-stdlib 5.0.0 provides the same manifests, classes
and functions as puppet-stdlib 4.25.1, the changes are more
present in the packaging architecture, inclusion of a new function,
and improved and updated documentation.
Updating the dependency declaration to allow version 5.0.0
of puppet-stdlib removes the warning, shows no signs of malfunction,
and does not prevent from successfully bootstraping and unlocking.
For that, the package puppet-etcd-1.12.3 was included and patched.

Debian Bullseye tests:
PASS: Build & install
PASS: Successful Bootstrap
PASS: Successful Unlock

Story: 2009101
Task: 44772

Signed-off-by: Matheus Machado Guilhermino <Matheus.MachadoGuilhermino@windriver.com>
Change-Id: I940faf6c406fa0146da86976154f4e4793621c40
---
 .../puppet-etcd-1.12.3/debian/meta_data.yaml  | 11 ++++++++
 .../0001-Allow-use-with-stdlib-5.0.0.patch    | 26 +++++++++++++++++++
 .../puppet-etcd-1.12.3/debian/patches/series  |  1 +
 debian_pkg_dirs                               |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml
 create mode 100644 config/puppet-modules/puppet-etcd-1.12.3/debian/patches/0001-Allow-use-with-stdlib-5.0.0.patch
 create mode 100644 config/puppet-modules/puppet-etcd-1.12.3/debian/patches/series

diff --git a/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml b/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml
new file mode 100644
index 000000000..3e7837c45
--- /dev/null
+++ b/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml
@@ -0,0 +1,11 @@
+---
+debname: puppet-module-cristifalcas-etcd
+debver: 1.12.3-3
+dl_path:
+  name: puppet-module-cristifalcas-etcd-1.12.3-3.tar.gz
+  url: https://salsa.debian.org/openstack-team/puppet/puppet-module-cristifalcas-etcd/-/archive/debian/1.12.3-3/puppet-module-cristifalcas-etcd-debian-1.12.3-3.tar.gz
+  md5sum: 9ca374f32dad83478801a6eb4c1c52dd
+  sha256sum: ce3d08c990c390b3927e9f62a8eb1beff4d49b60da7e997f3a886fc49cf3d911
+revision:
+  dist: $STX_DIST
+  PKG_GITREVCOUNT: true
diff --git a/config/puppet-modules/puppet-etcd-1.12.3/debian/patches/0001-Allow-use-with-stdlib-5.0.0.patch b/config/puppet-modules/puppet-etcd-1.12.3/debian/patches/0001-Allow-use-with-stdlib-5.0.0.patch
new file mode 100644
index 000000000..f0c4843fc
--- /dev/null
+++ b/config/puppet-modules/puppet-etcd-1.12.3/debian/patches/0001-Allow-use-with-stdlib-5.0.0.patch
@@ -0,0 +1,26 @@
+From 7ec509189906c18d93470004a2d676f1a07484b8 Mon Sep 17 00:00:00 2001
+From: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
+Date: Mon, 14 Mar 2022 17:46:12 +0000
+Subject: [PATCH] Allow use with stdlib-5.0.0
+
+Signed-off-by: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
+---
+ metadata.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/metadata.json b/metadata.json
+index b052ad3..f237870 100644
+--- a/metadata.json
++++ b/metadata.json
+@@ -52,7 +52,7 @@
+ 	],
+ 	"dependencies": [{
+ 			"name": "puppetlabs/stdlib",
+-			"version_requirement": ">= 4.6.0 < 5.0.0"
++			"version_requirement": ">= 4.6.0 <= 5.0.0"
+ 		}
+ 	],
+ 	"tags": [ "etcd"
+-- 
+2.30.2
+
diff --git a/config/puppet-modules/puppet-etcd-1.12.3/debian/patches/series b/config/puppet-modules/puppet-etcd-1.12.3/debian/patches/series
new file mode 100644
index 000000000..5df07950c
--- /dev/null
+++ b/config/puppet-modules/puppet-etcd-1.12.3/debian/patches/series
@@ -0,0 +1 @@
+0001-Allow-use-with-stdlib-5.0.0.patch
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index 008ffc734..f29321833 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -19,6 +19,7 @@ config/puppet-modules/openstack/puppet-oslo-17.4.0
 config/puppet-modules/puppet-boolean-2.0.2
 config/puppet-modules/puppet-dnsmasq
 config/puppet-modules/puppet-drbd-0.5.2
+config/puppet-modules/puppet-etcd-1.12.3
 config/puppet-modules/puppetlabs-haproxy-2.1.0
 config/puppet-modules/puppetlabs-postgresql-6.7.0
 config/puppet-modules/puppetlabs-stdlib-5.0.0