Merge pull request #133 from atlassian/cwood/puppet-agent-4

Cwood/puppet agent 4

Author: stephenrjohnson

manifests/agent.pp

@@ -17,8 +17,8 @@
 #   ['group_id']              - The groupid of the puppet group
 #   ['splay']                 - If splay should be enable defaults to false
 #   ['splaylimit']            - The maximum time to delay before runs.
-#   ['classfile']             - The file in which puppet agent stores a list of the classes 
-#                               associated with the retrieved configuration. 
+#   ['classfile']             - The file in which puppet agent stores a list of the classes
+#                               associated with the retrieved configuration.
 #   ['logdir']                - The directory in which to store log files
 #   ['environment']           - The environment of the puppet agent
 #   ['report']                - Whether to return reports
@@ -64,7 +64,7 @@
   $version                = 'present',
   $puppet_facter_package  = $::puppet::params::puppet_facter_package,
   $puppet_run_style       = 'service',
-  $puppet_run_command     = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
+  $puppet_run_command     = $::puppet::params::puppet_run_command,
   $user_id                = undef,
   $group_id               = undef,
   $package_provider       = $::puppet::params::package_provider,
@@ -86,7 +86,7 @@
   $puppet_run_interval    = $::puppet::params::puppet_run_interval,
   $splay                  = false,
 
-  # $splaylimit defaults to $runinterval per Puppetlabs docs:  
+  # $splaylimit defaults to $runinterval per Puppetlabs docs:
   # http://docs.puppetlabs.com/references/latest/configuration.html#splaylimit
   $splaylimit             = $::puppet::params::puppet_run_interval,
   $classfile              = $::puppet::params::classfile,
@@ -407,14 +407,25 @@
       section => 'main',
     }
   }
-  ini_setting {'puppetagentconfigtimeout':
-    setting => 'configtimeout',
-    value   => $configtimeout,
-  }
-  if $stringify_facts != undef {
+  if versioncmp($::puppetversion, "4.0.0") < 0 {
+    ini_setting {'puppetagentconfigtimeout':
+      setting => 'configtimeout',
+      value   => $configtimeout,
+    }
+    if $stringify_facts != undef {
+      ini_setting {'puppetagentstringifyfacts':
+        setting => 'stringify_facts',
+        value   => $stringify_facts,
+      }
+    }
+  } else {
+    ini_setting {'puppetagentconfigtimeout':
+      setting => 'configtimeout',
+      ensure  => absent,
+    }
     ini_setting {'puppetagentstringifyfacts':
       setting => 'stringify_facts',
-      value   => $stringify_facts,
+      ensure  => absent,
     }
   }
   if $verbose != undef {

manifests/params.pp

@@ -40,6 +40,18 @@
   # Only used when environments == directory
   $environmentpath                  = "${confdir}/environments"
 
+   if versioncmp($::puppetversion, "4.0.0") >= 0 {
+    $puppet_conf        = '/etc/puppetlabs/puppet/puppet.conf'
+    $puppet_run_command = '/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1'
+    $puppet_vardir      = '/opt/puppetlabs/server/data/puppetserver'
+    $puppet_ssldir      = '/etc/puppetlabs/puppet/ssl'
+  } else {
+    $puppet_conf        = '/etc/puppet/puppet.conf'
+    $puppet_run_command = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1'
+    $puppet_vardir      = '/var/lib/puppet'
+    $puppet_ssldir      = '/var/lib/puppet/ssl'
+  }
+
   case $::osfamily {
     'RedHat': {
       $puppet_master_package        = 'puppet-server'
@@ -48,9 +60,6 @@
       $puppet_agent_package         = 'puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_defaults              = '/etc/sysconfig/puppet'
-      $puppet_conf                  = '/etc/puppet/puppet.conf'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'mod_passenger'
       $rack_package                 = 'rubygem-rack'
       $ruby_dev                     = 'ruby-devel'
@@ -61,9 +70,6 @@
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'puppet'
       $package_provider                 = undef # falls back to system default
-      $puppet_conf                  = '/etc/puppet/puppet.conf'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'rubygem-passenger-apache2'
       $rack_package                 = 'rubygem-rack'
     }
@@ -74,9 +80,6 @@
       $puppet_agent_package         = 'puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_defaults              = '/etc/default/puppet'
-      $puppet_conf                  = '/etc/puppet/puppet.conf'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'libapache2-mod-passenger'
       $rack_package                 = 'librack-ruby'
       $ruby_dev                     = 'ruby-dev'
@@ -86,17 +89,12 @@
       $puppet_agent_package         = 'sysutils/puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_conf                  = '/usr/local/etc/puppet/puppet.conf'
-      $puppet_vardir                = '/var/puppet'
-      $puppet_ssldir                = '/var/puppet/ssl'
     }
     'Darwin': {
       $puppet_agent_service         = 'com.puppetlabs.puppet'
       $puppet_agent_package         = 'puppet-3.8.5.dmg'
       $puppet_facter_package        = 'facter-2.4.5.dmg'
       $package_provider             = 'pkgdmg'
-      $puppet_conf                  = '/etc/puppet/puppet.conf'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/etc/puppet/ssl'
     }
     default: {
       err('The Puppet module does not support your os')