Merge branch 'master' of https://github.com/zxjinn/puppetmodule into zxjinn-master

Conflicts:
	manifests/params.pp

Author: stephenrjohnson

manifests/agent.pp

@@ -55,6 +55,7 @@
   $puppet_run_command     = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
   $user_id                = undef,
   $group_id               = undef,
+  $package_provider       = $::puppet::params::package_provider,
 
   #[main]
   $templatedir            = undef,
@@ -110,6 +111,7 @@
   }
   package { $puppet_agent_package:
     ensure   => $version,
+    provider => $package_provider,
   }
 
   if $puppet_run_style == 'service' {

manifests/params.pp

@@ -33,6 +33,7 @@
   $digest_algorithm                 = 'md5'
   $puppet_run_interval              = 30
   $classfile                        = '$statedir/classes.txt'
+  $package_provider                 = undef # falls back to system default
 
   # Only used when environments == directory
   $environmentpath                  = "${confdir}/environments"