CHANGELOG

@@ -0,0 +1,6 @@
+2013-06-17 Release 0.3.0
+Features:
+- PE + POSS support
+
+Bugfixes:
+- Only ensure datadir if it does not have %{.*}

Modulefile

@@ -1,5 +1,5 @@
 name    'hunner-hiera'
-version '0.2.1'
+version '0.3.0'
 source 'UNKNOWN'
 author 'hunner'
 license 'BSD'

manifests/init.pp

@@ -1,25 +1,27 @@
-class hiera(
+class hiera (
   $hierarchy  = [],
-  $hiera_yaml = '/etc/puppetlabs/puppet/hiera.yaml',
-  $datadir    = '/etc/puppetlabs/puppet/hieradata',
-  $owner      = 'pe-puppet',
-  $group      = 'pe-puppet'
-) {
+  $hiera_yaml = $hiera::params::hiera_yaml,
+  $datadir    = $hiera::params::datadir,
+  $owner      = $hiera::params::owner,
+  $group      = $hiera::params::group
+) inherits hiera::params {
   File {
     owner => $owner,
     group => $group,
     mode  => '0644',
   }
-  file { $datadir:
-    ensure => directory,
+  if $datadir !~ /%{.*}/ {
+    file { $datadir:
+      ensure => directory,
+    }
   }
   # Template uses $hierarchy, $datadir
   file { $hiera_yaml:
     ensure  => present,
     content => template('hiera/hiera.yaml.erb'),
   }
   # Symlink for hiera command line tool
-  file { "/etc/hiera.yaml":
+  file { '/etc/hiera.yaml':
     ensure => symlink,
     target => $hiera_yaml,
   }

manifests/params.pp

@@ -0,0 +1,13 @@
+class hiera::params {
+  if $::puppetversion =~ /Puppet Enterprise/ {
+    $hiera_yaml = '/etc/puppetlabs/puppet/hiera.yaml'
+    $datadir    = '/etc/puppetlabs/puppet/hieradata'
+    $owner      = 'pe-puppet'
+    $group      = 'pe-puppet'
+  } else {
+    $hiera_yaml = '/etc/puppet/hiera.yaml'
+    $datadir    = '/etc/puppet/hieradata'
+    $owner      = 'puppet'
+    $group      = 'puppet'
+  }
+}