Merge remote-tracking branch 'origin/feature-msgpack' into feature-nginx

Author: bastelfreak

manifests/agent.pp

@@ -27,6 +27,8 @@
 #   ['templatedir']           - Template dir, if unset it will remove the setting.
 #   ['configtimeout']         - How long the client should wait for the configuration to be retrieved before considering it a failure
 #   ['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)
+#   ['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
@@ -66,6 +68,8 @@
   $digest_algorithm       = $::puppet::params::digest_algorithm,
   $configtimeout          = '2m',
   $stringify_facts        = undef,
+  $serialization_format   = undef,
+  $serialization_package  = undef,
 ) inherits puppet::params {
 
   if ! defined(User[$::puppet::params::puppet_user]) {
@@ -187,6 +191,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))
@@ -196,7 +201,6 @@
   elsif (($use_srv_records == true) and ($srv_domain != undef))
   {
     ini_setting {'puppetagentsrv_domain':
-      ensure  => present,
       setting => 'srv_domain',
       value   => $srv_domain,
     }
@@ -233,69 +237,57 @@
   }
 
   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,
   }
 
   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,
@@ -310,15 +302,44 @@
     }
   }
   ini_setting {'puppetagentconfigtimeout':
-    ensure  => present,
     setting => 'configtimeout',
     value   => $configtimeout,
   }
   if $stringify_facts != undef {
     ini_setting {'puppetagentstringifyfacts':
-      ensure  => present,
       setting => 'stringify_facts',
       value   => $stringify_facts,
     }
   }
+  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

@@ -42,6 +42,7 @@
 # ['disable_master']            - this disables the normal master, the server will only act as a CA, currently only supported by nginx
 # ['upstream']                  - define additional masters reachable via tcp as an array, currently only supported by nginx
 # ['backend_process_number']     - number of processes to start on the backebd webserver (unicorn/passenger), currently only supported by unicorn
+#  ['serialization_format']     - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
 #
 # Requires:
 #
@@ -105,6 +106,7 @@
   $disable_master             = $::puppet::params::disable_master,
   $upstream                   = $::puppet::params::upstream,
   $backend_process_number     = $::puppet::params::backend_process_number,
+  $serialization_format       = undef,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -353,6 +355,36 @@
       setting => 'digest_algorithm',
       value   => $digest_algorithm,
   }
-
+  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

@@ -56,6 +56,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'
@@ -79,6 +80,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'