Merge pull request #65 from nbetm/pe38_support

Added support for PE v3.8.0
voxpupuli · May 8, 2015 · 818025f · 818025f
2 parents 56c2eed + cea49d4
commit 818025f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -14,18 +14,22 @@
 # Copyright (C) 2013 Mike Arnold, unless otherwise noted.
 #
 class hiera::params {
-  if $::puppetversion =~ /Puppet Enterprise/ {
+  if str2bool($::is_pe) {
     $hiera_yaml = '/etc/puppetlabs/puppet/hiera.yaml'
     $datadir    = '/etc/puppetlabs/puppet/hieradata'
     $owner      = 'pe-puppet'
     $group      = 'pe-puppet'
     $confdir    = '/etc/puppetlabs/puppet'
-    if $::puppetversion =~ /3.7/ {
+
+
+    if versioncmp($::pe_version, '3.7.0') >= 0 {
       $provider = 'pe_puppetserver_gem'
-    } else {
+    }
+    else {
       $provider = 'pe_gem'
     }
-  } else {
+  }
+  else {
     $hiera_yaml = '/etc/puppet/hiera.yaml'
     $datadir    = '/etc/puppet/hieradata'
     $owner      = 'puppet'