Merge pull request #122 from bastelfreak/debian

Drop EoL Debian 10
voxpupuli · Jan 9, 2025 · 804fd5f · 804fd5f
2 parents 343fd98 + 3d3f8d9
commit 804fd5f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -9,8 +9,8 @@
   }
 
   $_config = $nomad::pretty_config ? {
-    true    => to_json_pretty($nomad::config_hash_real),
-    default => to_json($nomad::config_hash_real),
+    true    => stdlib::to_json_pretty($nomad::config_hash_real),
+    default => stdlib::to_json($nomad::config_hash_real),
   }
 
   $validate_cmd = $nomad::config_validator ? {

diff --git a/manifests/server_recovery.pp b/manifests/server_recovery.pp
@@ -66,7 +66,7 @@
         group => 'root';
       '/tmp/peers.json':
         mode    => '0640',
-        content => to_json_pretty($nomad_server_pretty_inventory);
+        content => stdlib::to_json_pretty($nomad_server_pretty_inventory);
       '/usr/local/bin/nomad-server-outage-recovery.sh':
         mode   => '0750',
         source => 'puppet:///modules/nomad/nomad-server-outage-recovery.sh';

diff --git a/metadata.json b/metadata.json
@@ -11,7 +11,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppet/archive",
@@ -30,7 +30,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "8"
       ]
@@ -59,15 +58,13 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]