Merge pull request #7 from bastelfreak/stdlib

puppetlabs/stdlib: Require 9.x
voxpupuli · Feb 27, 2024 · cb60c88 · cb60c88
2 parents 3987294 + a02b872
commit cb60c88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,10 +1,5 @@
+---
 fixtures:
   repositories:
-    stdlib:
-      repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref: "4.25.1"
-    apt:
-      repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
-      ref: "4.5.0"
-  symlinks:
-    aptly: "#{source_dir}"
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+    apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -72,7 +72,7 @@
   }
 
   $config_file_contents = $config_contents ? {
-    undef   => inline_template("<%= Hash[@config.sort].to_pson %>\n"),
+    undef   => $config.stdlib::to_json_pretty,
     default => $config_contents,
   }
 

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">=4.0.0 <5.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/apt",