hiera compatible refactoring

manifests/init.pp

@@ -1,15 +1,16 @@
 class puppet (
   $ensure  = 'present',
   $version = undef,
-  $pupppetlabs_apt             = true,
   $agent   = true,
+  $server  = false,
+  $facter_version              = $ensure,
+  $puppetlabs_apt              = true,
   $agent_norunifloggedin       = false,
   $agent_daemonize             = true,
   $agent_run_hour              = '*/1',
   $agent_run_minute            = '10',
   $agent_run_if_ipmatch        = '',
   $agent_maxsleep              = '3200',
-  $server  = false,
   $server_dns_alt_names        = undef,
   $server_storeconfigs         = false,
   $server_storeconfigs_backend = undef,
@@ -17,7 +18,7 @@ class puppet (
   $server_reports              = 'store',
   $server_passenger            = true) {
   if $puppetlabs_apt {
-    require 'puppet::puppetlabs_apt'
+    class { 'puppet::puppetlabs_apt': before => Class['puppet::facter'] }
   }
 
   if $version != undef {
@@ -29,7 +30,15 @@ class puppet (
   }
 
   class { 'puppet::facter':
-    ensure => $ensure,
+    ensure => $facter_version,
+  }
+
+  ini_setting { 'puppet-templatedir':
+    path    => '/etc/puppet/puppet.conf',
+    section => 'main',
+    setting => 'templatedir',
+    value   => '$confidr/templates',
+    ensure  => 'absent';
   }
 
   if $agent {