Merge branch 'feature-msgpack' of https://github.com/bastelfreak/puppetmodule into bastelfreak-feature-msgpack

Conflicts:
	manifests/agent.pp
	manifests/master.pp

Author: stephenrjohnson

manifests/agent.pp

@@ -33,6 +33,8 @@
 #   ['stringify_facts']       - Wether puppet transforms structured facts in strings or no. Defaults to true in puppet < 4, deprecated in puppet >=4 (and will default to false)
 #   ['cron_hour']             - What hour to run if puppet_run_style is cron
 #   ['cron_minute']           - What minute to run if puppet_run_style is cron
+#   ['serialization_format']  - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
+#   ['serialization_package'] - defaults to undef, if provided, we install this package, otherwise we fall back to the gem from 'serialization_format'
 #
 # Actions:
 # - Install and configures the puppet agent
@@ -93,6 +95,8 @@
   $http_proxy_port        = undef,
   $cron_hour              = '*',
   $cron_minute            = undef,
+  $serialization_format   = undef,
+  $serialization_package  = undef,
 ) inherits puppet::params {
 
   if ! defined(User[$::puppet::params::puppet_user]) {
@@ -218,6 +222,7 @@
       path    => $::puppet::params::puppet_conf,
       require => File[$::puppet::params::puppet_conf],
       section => 'agent',
+      ensure  => present,
   }
 
   if (($use_srv_records == true) and ($srv_domain == undef))
@@ -227,7 +232,6 @@
   elsif (($use_srv_records == true) and ($srv_domain != undef))
   {
     ini_setting {'puppetagentsrv_domain':
-      ensure  => present,
       setting => 'srv_domain',
       value   => $srv_domain,
     }
@@ -264,31 +268,26 @@
   }
 
   ini_setting {'puppetagentenvironment':
-    ensure  => present,
     setting => 'environment',
     value   => $environment,
   }
 
   ini_setting {'puppetagentmaster':
-    ensure  => present,
     setting => 'server',
     value   => $puppet_server,
   }
 
   ini_setting {'puppetagentuse_srv_records':
-    ensure  => present,
     setting => 'use_srv_records',
     value   => $use_srv_records,
   }
 
   ini_setting {'puppetagentruninterval':
-    ensure  => present,
     setting => 'runinterval',
     value   => $runinterval,
   }
 
   ini_setting {'puppetagentsplay':
-    ensure  => present,
     setting => 'splay',
     value   => $splay,
   }
@@ -306,39 +305,32 @@
   }
 
   ini_setting {'puppetmasterport':
-    ensure  => present,
     setting => 'masterport',
     value   => $puppet_server_port,
   }
   ini_setting {'puppetagentreport':
-    ensure  => present,
     setting => 'report',
     value   => $report,
   }
   ini_setting {'puppetagentpluginsync':
-    ensure  => present,
     setting => 'pluginsync',
     value   => $pluginsync,
   }
   ini_setting {'puppetagentlisten':
-    ensure  => present,
     setting => 'listen',
     value   => $listen,
   }
   ini_setting {'puppetagentreportserver':
-    ensure  => present,
     setting => 'reportserver',
     value   => $reportserver,
   }
   ini_setting {'puppetagentdigestalgorithm':
-    ensure  => present,
     setting => 'digest_algorithm',
     value   => $digest_algorithm,
   }
   if ($templatedir != undef) and ($templatedir != 'undef')
   {
     ini_setting {'puppetagenttemplatedir':
-      ensure  => present,
       setting => 'templatedir',
       section => 'main',
       value   => $templatedir,
@@ -353,13 +345,11 @@
     }
   }
   ini_setting {'puppetagentconfigtimeout':
-    ensure  => present,
     setting => 'configtimeout',
     value   => $configtimeout,
   }
   if $stringify_facts != undef {
     ini_setting {'puppetagentstringifyfacts':
-      ensure  => present,
       setting => 'stringify_facts',
       value   => $stringify_facts,
     }
@@ -430,4 +420,35 @@
       value   => $http_proxy_port,
     }
   }
+  if $serialization_format != undef {
+    if $serialization_package != undef {
+      package { $serialization_package:
+        ensure  => latest,
+      }
+    } else {
+      if $serialization_format == 'msgpack' {
+        unless defined(Package[$::puppet::params::ruby_dev]) {
+          package {$::puppet::params::ruby_dev:
+            ensure  => 'latest',
+          }
+        }
+        unless defined(Package['gcc']) {
+          package {'gcc':
+            ensure  => 'latest',
+          }
+        }
+        unless defined(Package['msgpack']) {
+          package {'msgpack':
+            ensure    => 'latest',
+            provider  => 'gem',
+            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+          }
+        }
+      }
+    }
+    ini_setting {'puppetagentserializationformatagent':
+      setting => 'preferred_serialization_format',
+      value   => $serialization_format,
+    }
+  }
 }

manifests/master.pp

@@ -35,6 +35,7 @@
 #  ['generate_ssl_certs']       - Generate ssl certs (false to disable)
 #  ['strict_variables']         - Makes the parser raise errors when referencing unknown variables
 #  ['always_cache_features']    - if false (default), always try to load a feature even if a previous load failed
+#  ['serialization_format']     - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
 #
 # Requires:
 #
@@ -96,8 +97,7 @@
   $passenger_high_performance   = true,
   $passenger_max_requests       = 10000,
   $passenger_stat_throttle_rate = 30,
-
-
+  $serialization_format       = undef,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -339,12 +339,42 @@
       value   => $strict_variables,
     }
   }
-
   validate_bool(str2bool($always_cache_features))
   ini_setting { 'puppetmasteralwayscachefeatures':
     ensure  => present,
     setting => 'always_cache_features',
     value   => $always_cache_features,
   }
+  if $serialization_format != undef {
+    if $serialization_package != undef {
+      package { $serialization_package:
+        ensure  => latest,
+      }
+    } else {
+      if $serialization_format == 'msgpack' {
+        unless defined(Package[$::puppet::params::ruby_dev]) {
+          package {$::puppet::params::ruby_dev:
+            ensure  => 'latest',
+          }
+        }
+        unless defined(Package['gcc']) {
+          package {'gcc':
+            ensure  => 'latest',
+          }
+        }
+        unless defined(Package['msgpack']) {
+          package {'msgpack':
+            ensure  => 'latest',
+            provider => 'gem',
+            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+          }
+        }
+      }
+    }
+    ini_setting {'puppetagentserializationformatmaster':
+      setting => 'preferred_serialization_format',
+      value   => $serialization_format,
+    }
+  }
   anchor { 'puppet::master::end': }
 }

manifests/params.pp

@@ -50,6 +50,7 @@
       $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'mod_passenger'
       $rack_package                 = 'rubygem-rack'
+      $ruby_dev                     = 'ruby-devel'
     }
     'Suse': {
       $puppet_master_package        = 'puppet-server'
@@ -73,6 +74,7 @@
       $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'libapache2-mod-passenger'
       $rack_package                 = 'librack-ruby'
+      $ruby_dev                     = 'ruby-dev'
     }
     'FreeBSD': {
       $puppet_agent_service         = 'puppet'