starlingx
/
integ
Code Issues Proposed changes

Merge "Adjust puppet haproxy and firewall dependencies"

This commit is contained in:
Zuul 2023-06-20 13:06:14 +00:00 committed by Gerrit Code Review
parent be5ceba001 3d37dd17a9
commit 3087194306
4 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/puppet-modules/puppetlabs-firewall-1.12.0/debian/patches/0002-Adjust-puppet-firewall-dependency-requirements.patch Normal file
View File

@ -0,0 +1,29 @@
From 2eed01971650a57800e734ed103085c2349ff01c Mon Sep 17 00:00:00 2001
From: Matheus Guilhermino <matheus.machadoguilhermino@windriver.com>
Date: Fri, 9 Jun 2023 10:00:02 -0300
Subject: [PATCH] Adjust puppet-firewall dependency requirements
To avoid warnings during bootstrap, the accepted version range
for puppetlabs-stdlib was changed to accommodate a higher version.
Signed-off-by: Matheus Guilhermino <matheus.machadoguilhermino@windriver.com>
---
metadata.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metadata.json b/metadata.json
index 00c0015..5088ea3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
- "version_requirement": ">= 4.0.0 < 5.0.0"
+ "version_requirement": ">= 4.0.0 < 6.0.0"
}
],
"data_provider": null,
--
2.37.1

1
config/puppet-modules/puppetlabs-firewall-1.12.0/debian/patches/series
View File

@ -1 +1,2 @@
0001-Add-support-for-random-fully-flag.patch
0002-Adjust-puppet-firewall-dependency-requirements.patch

35
config/puppet-modules/puppetlabs-haproxy-2.1.0/debian/patches/0005-Adjust-puppet-haproxy-dependency-requirements.patch Normal file
View File

@ -0,0 +1,35 @@
From 5f4be332f0de3a60117aac1dd4baf75f7c82151a Mon Sep 17 00:00:00 2001
From: Matheus Guilhermino <matheus.machadoguilhermino@windriver.com>
Date: Fri, 9 Jun 2023 09:07:04 -0300
Subject: [PATCH] Adjust puppet-haproxy dependency requirements
To avoid warnings during bootstrap, the accepted version ranges
for puppetlabs-concat and puppetlabs-stdlib were changed to
accommodate higher versions of both.
Signed-off-by: Matheus Guilhermino <matheus.machadoguilhermino@windriver.com>
---
metadata.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/metadata.json b/metadata.json
index b868a77..b120c21 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,11 +10,11 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
- "version_requirement": ">= 4.13.1 < 5.0.0"
+ "version_requirement": ">= 4.13.1 < 6.0.0"
},
{
"name": "puppetlabs/concat",
- "version_requirement": ">= 1.2.3 < 5.0.0"
+ "version_requirement": ">= 1.2.3 < 6.0.0"
}
],
"operatingsystem_support": [
--
2.37.1

1
config/puppet-modules/puppetlabs-haproxy-2.1.0/debian/patches/series
View File

@ -2,3 +2,4 @@
0002-Disable-configuration-validation-during-manifest-app.patch
0003-Fix-global_options-log-default-value.patch
0004-Stop-invalid-warning-message.patch
0005-Adjust-puppet-haproxy-dependency-requirements.patch