Fix merge conflicts

Author: stephenrjohnson

manifests/agent.pp

@@ -29,6 +29,7 @@
 #   ['trusted_node_data']     - Enable the trusted facts hash
 #   ['listen']                - If puppet agent should listen for connections
 #   ['reportserver']          - The server to send transaction reports to.
+#   ['show_diff']             - Should the reports contain diff output
 #   ['digest_algorithm']      - The algorithm to use for file digests.
 #   ['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
@@ -95,6 +96,7 @@
   $pluginsync             = true,
   $listen                 = false,
   $reportserver           = '$server',
+  $show_diff              = undef,
   $digest_algorithm       = $::puppet::params::digest_algorithm,
   $configtimeout          = '2m',
   $stringify_facts        = undef,
@@ -157,7 +159,7 @@
     $startonboot = 'no'
     $daemonize = false
   }
-  
+
 
   if ($::osfamily == 'Debian' and $puppet_run_style != 'manual') or ($::osfamily == 'Redhat') {
     file { $puppet::params::puppet_defaults:
@@ -307,6 +309,20 @@
       value   => $puppet_ssldir,
     }
   }
+  
+  if $show_diff != undef {
+    ini_setting {'puppetagentshow_diff':
+      ensure  => present,
+      section => 'main',
+      setting => 'show_diff',
+      value   => $show_diff,
+    }
+    unless defined(Package[$::puppet::params::ruby_diff_lcs]) {
+      package {$::puppet::params::ruby_diff_lcs:
+        ensure  => 'latest',
+      }
+    }
+  }
 
   # rundir has no default and must be provided.
   ini_setting {'puppetagentrundir':
@@ -536,4 +552,4 @@
       value   => $serialization_format,
     }
   }
-}
+}

manifests/params.pp

@@ -64,6 +64,7 @@
       $rack_package                 = 'rubygem-rack'
       $ruby_dev                     = 'ruby-devel'
       $puppet_facter_package        = nil
+      $ruby_diff_lcs                = 'rubygem-diff-lcs'
     }
     'Suse': {
       $puppet_master_package        = 'puppet-server'
@@ -74,6 +75,7 @@
       $passenger_package            = 'rubygem-passenger-apache2'
       $rack_package                 = 'rubygem-rack'
       $puppet_facter_package        = nil
+      $ruby_diff_lcs                = 'rubygem-diff-lcs'
     }
     'Debian': {
       $puppet_master_package        = 'puppetmaster'
@@ -86,6 +88,7 @@
       $rack_package                 = 'librack-ruby'
       $ruby_dev                     = 'ruby-dev'
       $puppet_facter_package        = nil
+      $ruby_diff_lcs                = 'ruby-diff-lcs'
     }
     'FreeBSD': {
       $puppet_agent_service         = 'puppet'

spec/classes/puppet_agent_spec.rb

@@ -557,6 +557,33 @@
       }
     end
   end
+  describe 'puppetagentshow_diff' do
+    let(:facts) do
+      {
+        :osfamily        => 'RedHat',
+        :operatingsystem => 'RedHat',
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
+      }
+    end
+    context 'with show_diff set' do
+      let(:params) do
+        {
+          :show_diff        => true,
+        }
+      end
+
+      it{
+        should contain_ini_setting('puppetagentshow_diff').with(
+          :ensure  => 'present',
+          :section => 'main',
+          :setting => 'show_diff',
+          :value   => true,
+          :path    => '/etc/puppet/puppet.conf'
+        )
+      }
+    end
+  end
   describe 'puppetagentstringifyfacts' do
     let(:facts) do
       {