Merge pull request #1558 from bastelfreak/stdlib

puppetlabs/stdlib: Allow 9.x & puppetlabs/concat: Allow 8.x & 9.x
voxpupuli · Jun 22, 2023 · 1cf3b1d · 1cf3b1d
2 parents cf71ed1 + 33301b3
commit 1cf3b1d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -3,6 +3,4 @@ fixtures:
     apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
     concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-    yumrepo_core:
-      repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
-      puppet_version: ">= 6.0.0"
+    yumrepo_core: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -81,7 +81,7 @@
   $map_hash_bucket_size           = $nginx::map_hash_bucket_size
   $map_hash_max_size              = $nginx::map_hash_max_size
   $mime_types                     = $nginx::mime_types_preserve_defaults ? {
-    true    => merge($nginx::params::mime_types,$nginx::mime_types),
+    true    => $nginx::params::mime_types + $nginx::mime_types,
     default => $nginx::mime_types,
   }
   $multi_accept                   = $nginx::multi_accept

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -192,7 +192,7 @@
     }
   }
 
-  $_module_parameters = merge($_module_defaults, $_module_os_overrides)
+  $_module_parameters = $_module_defaults + $_module_os_overrides
   ### END Operating System Configuration
 
   ### Referenced Variables

diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -167,7 +167,7 @@
 
   if ! empty($members) {
     $members.each |$member,$values| {
-      $member_values = merge($member_defaults, $values, { 'upstream' => $name, 'context' => $context })
+      $member_values = $member_defaults + $values + { 'upstream' => $name, 'context' => $context }
 
       if $context == 'stream' and $member_values['route'] {
         fail('The parameter "route" is not available for upstreams with context "stream"')

diff --git a/metadata.json b/metadata.json
@@ -10,17 +10,17 @@
   "dependencies": [
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 4.1.0 < 8.0.0"
+      "version_requirement": ">= 4.1.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 5.0.0 < 9.0.0"
+      "version_requirement": ">= 5.0.0 < 10.0.0"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [