Require stdlib 9.x

treydock · Oct 14, 2024 · 115e0cb · 115e0cb
1 parent 88f68b8
commit 115e0cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -8,7 +8,7 @@ fixtures:
       repo: puppetlabs/stdlib
     firewall:
       repo: puppetlabs/firewall
-      ref: '5.0.0'
+      ref: '6.0.0'
     mysql:
       repo: puppetlabs/mysql
     concat:

diff --git a/manifests/common/install/source.pp b/manifests/common/install/source.pp
@@ -7,7 +7,7 @@
     $package_require = undef
   }
 
-  ensure_packages($slurm::source_dependencies)
+  stdlib::ensure_packages($slurm::source_dependencies)
   $slurm::source_dependencies.each |$package| {
     if $package_require {
       $package_require -> Package[$package]

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -578,8 +578,8 @@
   }
 
   $_slurm_conf_override = $slurm_conf_override - ['SlurmctldParameters']
-  $slurm_conf_defaults  = merge($slurm::params::slurm_conf_defaults, $slurm_conf_local_defaults)
-  $slurm_conf           = merge($slurm_conf_defaults, $_slurm_conf_override)
+  $slurm_conf_defaults  = $slurm::params::slurm_conf_defaults + $slurm_conf_local_defaults
+  $slurm_conf           = $slurm_conf_defaults + $_slurm_conf_override
 
   $slurmdbd_conf_local_defaults = {
     'ArchiveDir' => $slurmdbd_archive_dir,
@@ -597,8 +597,8 @@
     'StorageUser' => $slurmdbd_storage_user,
   }
 
-  $slurmdbd_conf_defaults = merge($slurm::params::slurmdbd_conf_defaults, $slurmdbd_conf_local_defaults)
-  $slurmdbd_conf          = merge($slurmdbd_conf_defaults, $slurmdbd_conf_override)
+  $slurmdbd_conf_defaults = $slurm::params::slurmdbd_conf_defaults + $slurmdbd_conf_local_defaults
+  $slurmdbd_conf          = $slurmdbd_conf_defaults + $slurmdbd_conf_override
 
   if $cgroup_conf_source {
     $cgroup_conf_content = undef

diff --git a/metadata.json b/metadata.json
@@ -10,23 +10,23 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">=4.25.1 <9.0.0"
+      "version_requirement": ">=9.0.0 <10.0.0"
     },
     {
       "name": "puppetlabs/firewall",
-      "version_requirement": ">=1.0.0 <6.0.0"
+      "version_requirement": ">=6.0.0 <7.0.0"
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">=1.0.0 <9.0.0"
+      "version_requirement": ">=1.0.0 <10.0.0"
     },
     {
       "name": "puppetlabs/mysql",
-      "version_requirement": ">=2.3.0 <15.0.0"
+      "version_requirement": ">=2.3.0 <17.0.0"
     },
     {
       "name": "puppet/epel",
-      "version_requirement": ">= 3.0.0 <5.0.0"
+      "version_requirement": ">= 3.0.0 <6.0.0"
     },
     {
       "name": "puppet/augeasproviders_sysctl",
@@ -42,15 +42,15 @@
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 3.1.0 <7.0.0"
+      "version_requirement": ">= 3.1.0 <8.0.0"
     },
     {
       "name": "puppet/archive",
       "version_requirement": ">= 1.0.0 <8.0.0"
     },
     {
       "name": "puppet/alternatives",
-      "version_requirement": ">= 2.1.0 <6.0.0"
+      "version_requirement": ">= 2.1.0 <7.0.0"
     },
     {
       "name": "treydock/slurm_providers",