From 35af81c7aa946c88cf7a30a517316f46b67deeb8 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 3 Jun 2024 20:37:19 +0200 Subject: [PATCH 1/3] puppetlabs/stdlib: require 9.x --- manifests/config.pp | 4 ++-- manifests/server_recovery.pp | 2 +- metadata.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 317c615..0cc4847 100644 --- 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 index 79735a8..778a250 100644 --- 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 index cc70f7c..9ae9d4a 100644 --- 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", From 8ffe94678806794e274d99e11ea5759472d2ee43 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 9 Jan 2025 17:10:47 +0100 Subject: [PATCH 2/3] Drop EoL EL7 --- metadata.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/metadata.json b/metadata.json index 9ae9d4a..b13838f 100644 --- a/metadata.json +++ b/metadata.json @@ -30,7 +30,6 @@ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "7", "8", "8" ] @@ -59,7 +58,6 @@ { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "7", "8", "9" ] From 3d3f8d9970f7c74e6d241adeec65232f4d7eec1b Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 9 Jan 2025 17:12:56 +0100 Subject: [PATCH 3/3] Drop EoL Debian 10 --- metadata.json | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata.json b/metadata.json index b13838f..278655b 100644 --- a/metadata.json +++ b/metadata.json @@ -65,7 +65,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10", "11", "12" ]