Merge pull request #438 from bastelfreak/is_pe

wrap is_pe fact in fact() method to fail safely if it isn't present
voxpupuli · Jul 5, 2018 · 0dfc213 · 0dfc213
2 parents 39e5a8e + 57fb516
commit 0dfc213
Show file tree

Hide file tree

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

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -44,7 +44,7 @@
   # We check for the function right now instead of $::pe_server_version
   # which does not get populated on agent nodes as some users use r10k
   # with razor see https://github.com/acidprime/r10k/pull/219
-  if $::is_pe == true or $::is_pe == 'true' {
+  if fact('is_pe') == true or fact('is_pe') == 'true' {
     # < PE 4
     $is_pe_server      = true
   }elsif is_function_available('pe_compiling_server_version') {

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