use stdlib puppet facts for configuration

puppetserver doesn't honor puppet.conf vardir settings
voxpupuli · May 1, 2017 · 96087ee · 96087ee
1 parent 538e0d9
commit 96087ee
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -2,7 +2,7 @@ fixtures:
   repositories:
     stdlib:
       repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref:  "4.13.1"
+      ref:  "4.15.0"
     ruby:    "git://github.com/puppetlabs/puppetlabs-ruby.git"
     gcc:     "git://github.com/puppetlabs/puppetlabs-gcc.git"
     pe_gem:  "git://github.com/puppetlabs/puppetlabs-pe_gem.git"

diff --git a/default_module_facts.yml b/default_module_facts.yml
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -10,8 +10,8 @@
   $sources                = undef
   $puppet_master          = true
 
-  $r10k_basedir              = $::settings::environmentpath
-  $r10k_cache_dir            = "${::settings::vardir}/r10k"
+  $r10k_basedir              = $facts['puppet_environmentpath']
+  $r10k_cache_dir            = "${facts['puppet_vardir']}/r10k"
   $r10k_config_file          = '/etc/puppetlabs/r10k/r10k.yaml'
   $r10k_binary               = 'r10k'
   $puppetconf_path           = '/etc/puppetlabs/puppet'

diff --git a/metadata.json b/metadata.json
@@ -54,7 +54,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 5.0.0"
+      "version_requirement": ">= 4.15.0 < 5.0.0"
     },
     {
       "name": "puppetlabs/ruby",

diff --git a/spec/default_module_facts.yml b/spec/default_module_facts.yml
@@ -0,0 +1,4 @@
+---
+pe_version: '2016.4.1'
+puppet_environmentpath: '/etc/puppetlabs/code/environments'
+puppet_vardir: '/opt/puppetlabs/puppet/cache'