Merge pull request voxpupuli#217 from oranenj/remove_vardir_fact

Make use of the stdlib puppet_vardir fact instead of a custom one
EmRowlands · May 4, 2017 · 09d3f0e · 09d3f0e
2 parents aa0f9af + 4688cf9
commit 09d3f0e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/lib/facter/selinux_agent_vardir.rb b/lib/facter/selinux_agent_vardir.rb
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -13,7 +13,7 @@
 
   $refpolicy_package_name = 'selinux-policy-devel'
 
-  $module_build_root = "${::selinux_agent_vardir}/puppet-selinux"
+  $module_build_root = "${facts['puppet_vardir']}/puppet-selinux"
 
   if $::operatingsystemmajrelease {
     $os_maj_release = $::operatingsystemmajrelease

diff --git a/spec/default_module_facts.yml b/spec/default_module_facts.yml
@@ -5,5 +5,4 @@ operatingsystemmajrelease: '7'
 # concat facts
 id: 0
 path: /tmp
-# custom fact for module building:
-selinux_agent_vardir: /var/lib/puppet
+puppet_vardir: /var/lib/puppet