Merge branch 'production' into feature/expanded_custom_facts

.travis.yml

@@ -22,6 +22,8 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 4.8.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.2.0"
   - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 4.9.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.10.1" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
 
 deploy:
   provider: puppetforge

README.md

@@ -352,6 +352,10 @@ The `puppet` class is responsible for validating some of our parameters, and ins
 
     Sets the runinterval in `puppet.conf`
 
+  * **show_diff**: (*bool* Default: `false`)
+
+    Whether to log and report a contextual diff when files are being replaced. 
+
   * **splay**: (*bool* Default `false`)
 
     Sets the splay parameter in puppet.conf

manifests/config.pp

@@ -15,6 +15,7 @@
   $puppet_server                  = $::puppet::puppet_server
   $reports                        = $::puppet::reports
   $runinterval                    = $::puppet::runinterval
+  $show_diff                      = $::puppet::show_diff
   $splay                          = $::puppet::splay
   $splaylimit                     = $::puppet::splaylimit
   $structured_facts               = $::puppet::structured_facts
@@ -66,10 +67,19 @@
     $_ensure_pluginfactsource = 'absent'
   }
 
+  ini_setting { 'puppet client server agent':
+    ensure  => absent,
+    path    => "${confdir}/puppet.conf",
+    section => 'agent',
+    setting => 'server',
+    value   => $puppet_server,
+    require => Class['puppet::install'],
+  }
+
   ini_setting { 'puppet client server':
     ensure  => $_ensure_puppet_server,
     path    => "${confdir}/puppet.conf",
-    section => 'agent',
+    section => 'main',
     setting => 'server',
     value   => $puppet_server,
     require => Class['puppet::install'],
@@ -143,6 +153,15 @@
     require => Class['puppet::install'],
   }
 
+  ini_setting { 'puppet client show_diff':
+    ensure  => present,
+    path    => "${confdir}/puppet.conf",
+    section => 'agent',
+    setting => 'show_diff',
+    value   => $show_diff,
+    require => Class['puppet::install'],
+  }
+
   ini_setting { 'puppet client splay':
     ensure  => present,
     path    => "${confdir}/puppet.conf",

manifests/init.pp

@@ -66,6 +66,8 @@
 #   Whether or not to send reports
 # @param runinterval [String] Default: '30m'
 #   Sets the runinterval in puppet.conf
+# @param show_diff [Boolean] Default: false
+#   Sets the show_diff parameter in puppet.conf
 # @param splay [Boolean] Default: false
 #   Sets the splay parameter in puppet.conf
 # @param splaylimit [String] Default: undef
@@ -122,6 +124,7 @@
   $puppet_version                 = 'installed',
   $reports                        = true,
   $runinterval                    = '30m',
+  $show_diff                      = false,
   $splay                          = false,
   $splaylimit                     = undef,
   $structured_facts               = false,
@@ -141,6 +144,7 @@
     $manage_etc_facter_facts_d,
     $manage_repos,
     $reports,
+    $show_diff,
     $splay,
     $structured_facts,
   )

manifests/install.pp

@@ -20,7 +20,8 @@
 
   package { $agent_package:
     ensure  => $package_ensure,
-    require => Class['::puppet::install::deps']
+    require => Class['::puppet::install::deps'],
+    notify  => Class['::puppet::agent'],
   }
 
 }

manifests/profile/agent.pp

@@ -62,6 +62,8 @@
 #   Whether or not to send reports
 # @param runinterval [String] Default: '30m'
 #   Sets the runinterval in puppet.conf
+# @param show_diff [Boolean] Default: false
+#   Sets the show_diff parameter in puppet.conf
 # @param splay [Boolean] Default: false
 #   Sets the splay parameter in puppet.conf
 # @param splaylimit [String] Default: undef
@@ -101,6 +103,7 @@
   $puppet_version                 = 'installed',
   $reports                        = true,
   $runinterval                    = '30m',
+  $show_diff                      = false,
   $splay                          = false,
   $splaylimit                     = undef,
   $structured_facts               = false,
@@ -131,6 +134,7 @@
     puppet_version                 => $puppet_version,
     reports                        => $reports,
     runinterval                    => $runinterval,
+    show_diff                      => $show_diff,
     splay                          => $splay,
     splaylimit                     => $splaylimit,
     structured_facts               => $structured_facts,

manifests/profile/puppetdb.pp

@@ -10,6 +10,11 @@
 #
 # @param puppetdb_version [String] Default: 'installed'
 #   The version of puppetdb to install.
+# @param puppetdb_manage_dbserver [Boolean] Default: true
+#   Whether to tell PuppetDB to also manage the Postgresql server.
+#   Set this to false if you are independently configuring a
+#   Postgresql server, e.g., because you are using it for other
+#   databases in addition to pupept.
 # @param node_purge_ttl [String] Default: 0s
 #   The length of time a node can be deactivated before it's deleted from the database. (a value of '0' disables purging).
 # @param node_ttl [String] Default: '0s'
@@ -33,6 +38,7 @@
   $node_ttl                    = '0s',
   $puppetdb_listen_address     = '127.0.0.1',
   $puppetdb_server             = undef,
+  $puppetdb_manage_dbserver    = true,
   $puppetdb_ssl_listen_address = '0.0.0.0',
   $report_ttl                  = '14d',
   $reports                     = undef,
@@ -106,6 +112,7 @@
     disable_ssl        => $disable_ssl,
     listen_address     => $puppetdb_listen_address,
     ssl_listen_address => $puppetdb_ssl_listen_address,
+    manage_dbserver    => $puppetdb_manage_dbserver,
     node_ttl           => $node_ttl,
     node_purge_ttl     => $node_purge_ttl,
     report_ttl         => $report_ttl,

manifests/profile/r10k.pp

@@ -8,6 +8,7 @@
 # @param cachedir [String] Default: undef
 # @param configfile [String] Default: undef
 # @param version [String] Default: undef
+# @param puppet_master [String] Default: undef
 # @param modulepath [String] Default: undef
 # @param manage_modulepath [String] Default: undef
 # @param manage_ruby_dependency [String] Default: 'ignore'
@@ -21,6 +22,9 @@
 # @param configfile_symlink [String] Default: undef
 # @param include_prerun_command [Boolean] Default: false
 # @param include_postrun_command [Boolean] Default: false
+# @param git_settings [String] Default: undef
+# @param forge_settings [String] Default: undef
+# @param postrun [String] Default: undef
 # @param env_owner [String] Default:'root',
 # @param r10k_minutes [Array] Default [0,15,30,45]
 # @param r10k_update [Boolean] true
@@ -32,6 +36,7 @@
   $cachedir                  = undef,
   $configfile                = undef,
   $version                   = undef,
+  $puppet_master             = undef,
   $modulepath                = undef,
   $manage_modulepath         = undef,
   $manage_ruby_dependency    = 'ignore',
@@ -45,6 +50,9 @@
   $configfile_symlink        = undef,
   $include_prerun_command    = false,
   $include_postrun_command   = false,
+  $git_settings              = undef,
+  $forge_settings            = undef,
+  $postrun                   = undef,
   $env_owner                 = 'root',
   $r10k_minutes              = [
     0,
@@ -82,6 +90,7 @@
     cachedir                  => $cachedir,
     configfile                => $configfile,
     version                   => $version,
+    puppet_master             => $puppet_master,
     modulepath                => $modulepath,
     manage_modulepath         => $manage_modulepath,
     manage_ruby_dependency    => $manage_ruby_dependency,
@@ -95,6 +104,9 @@
     configfile_symlink        => $configfile_symlink,
     include_prerun_command    => $include_prerun_command,
     include_postrun_command   => $include_postrun_command,
+    git_settings              => $git_settings,
+    forge_settings            => $forge_settings,
+    postrun                   => $postrun,
   }
 
   # cron for updating the r10k environment

spec/classes/puppet_config_spec.rb

@@ -44,13 +44,22 @@
       end
       context 'when fed no parameters' do
         it "should properly set the puppet server setting in #{confdir}/puppet.conf" do
+          should contain_ini_setting('puppet client server agent').with({
+            'ensure'=>'absent',
+            'path'=>"#{confdir}/puppet.conf",
+            'section'=>'agent',
+            'setting'=>'server',
+            'value'=>'puppet'
+          })
           should contain_ini_setting('puppet client server').with({
             'ensure'=>'present',
             'path'=>"#{confdir}/puppet.conf",
-            'section'=>'agent',
+            'section'=>'main',
             'setting'=>'server',
             'value'=>'puppet'
           })
+        end
+        it "should properly set the puppet srv records settings in #{confdir}/puppet.conf" do
           should contain_ini_setting('puppet use_srv_records').with({
             'ensure'=>'absent',
             'path'=>"#{confdir}/puppet.conf",
@@ -82,6 +91,15 @@
             'value'=>'30m'
           })
         end
+        it "should set the puppet agent show_diff parameter in #{confdir}/puppet.conf" do
+          should contain_ini_setting('puppet client show_diff').with({
+            'ensure'=>'present',
+            'path'=>"#{confdir}/puppet.conf",
+            'section'=>'agent',
+            'setting'=>'show_diff',
+            'value'=>false
+          })
+        end
         it "should set the puppet agent splay parameter in #{confdir}/puppet.conf" do
           should contain_ini_setting('puppet client splay').with({
             'ensure'=>'present',
@@ -187,12 +205,18 @@
       context 'when ::puppet::puppet_server has a non-standard value' do
         let(:pre_condition){"class{'::puppet': puppet_server => 'BOGON'}"}
         it "should properly set the server setting in #{confdir}/puppet.conf" do
-          should contain_ini_setting('puppet client server').with({
+          should_not contain_ini_setting('puppet client server').with({
             'path'=>"#{confdir}/puppet.conf",
             'section'=>'agent',
             'setting'=>'server',
             'value'=>'BOGON'
           })
+          should contain_ini_setting('puppet client server').with({
+            'path'=>"#{confdir}/puppet.conf",
+            'section'=>'main',
+            'setting'=>'server',
+            'value'=>'BOGON'
+          })
         end
       end# custom server
       context 'when ::puppet::environment has a non-standard value' do
@@ -217,6 +241,17 @@
           })
         end
       end# custom runinterval
+      context 'when ::puppet::show_diff is true' do
+        let(:pre_condition) {"class{'::puppet': show_diff => true}"}
+        it "should properly set the show_diff setting in #{confdir}/puppet.conf" do
+          should contain_ini_setting('puppet client show_diff').with({
+            'path'=>"#{confdir}/puppet.conf",
+            'section'=>'agent',
+            'setting'=>'show_diff',
+            'value'=>true
+          })
+        end
+      end# custom show_diff
       context 'when ::puppet::splay is true' do
         let(:pre_condition) {"class{'::puppet': splay => true}"}
         it "should properly set the splay setting in #{confdir}/puppet.conf" do
@@ -283,7 +318,7 @@
           should contain_ini_setting('puppet client server').with({
             'ensure' => 'absent',
             'path'=>"#{confdir}/puppet.conf",
-            'section'=>'agent',
+            'section'=>'main',
             'setting'=>'server',
           })
         end

spec/classes/puppet_install_spec.rb

@@ -63,7 +63,7 @@
           it 'should install puppet' do
             contain_package('puppet').with({
             :ensure=>"BOGON",
-          }).that_requires("Class['::puppet::install::deps]")
+          }).that_requires("Class['::puppet::install::deps]").that_notifies('class[Puppet::Agent]')
           end
         end# allinone false
       end

spec/classes/puppet_profile_puppetdb_spec.rb

@@ -67,6 +67,7 @@
             :disable_ssl        => false,
             :listen_address     => '127.0.0.1',
             :ssl_listen_address => '0.0.0.0',
+            :manage_dbserver    => true,
             :node_ttl           => '0s',
             :node_purge_ttl     => '0s',
             :report_ttl         => '14d',

spec/classes/puppet_spec.rb

@@ -28,7 +28,7 @@
      end
    end#arrays
 
-    ['allinone','cfacter','enable_devel_repo','enabled','enable_repo','manage_etc_facter','manage_etc_facter_facts_d','manage_repos','reports','splay','structured_facts'].each do |bools|
+    ['allinone','cfacter','enable_devel_repo','enabled','enable_repo','manage_etc_facter','manage_etc_facter_facts_d','manage_repos','reports','show_diff','splay','structured_facts'].each do |bools|
       context "when the #{bools} parameter is not an boolean" do
         let(:params) {{bools => "BOGON"}}
         it 'should fail' do