Merge pull request #257 from syseleven/add-disable-update-checking

Add disable-update-checking parameter

Author: mullr

README.md

@@ -675,6 +675,11 @@ Defaults to `undef`, using the PuppetDB built-in default.
 The amount of disk space (in MB) to allow for temporary message storage.
 Defaults to `undef`, using the PuppetDB built-in default.
 
+####`disable_update_checking`
+
+Setting this to true disables checking for updated versions of PuppetDB and sending basic analytics data to Puppet. 
+Defaults to `undef`, using the PuppetDB built-in default.
+
 ####`certificate_whitelist_file`
 
 The name of the certificate whitelist file to set up and configure in PuppetDB. Defaults to `/etc/puppetdb/certificate-whitelist` or `/etc/puppetlabs/puppetdb/certificate-whitelist` for FOSS and PE respectively.

manifests/init.pp

@@ -70,6 +70,7 @@
   $concurrent_writes                 = $puppetdb::params::concurrent_writes,
   $store_usage                       = $puppetdb::params::store_usage,
   $temp_usage                        = $puppetdb::params::temp_usage,
+  $disable_update_checking           = $puppetdb::params::disable_update_checking,
   $certificate_whitelist_file        = $puppetdb::params::certificate_whitelist_file,
   $certificate_whitelist             = $puppetdb::params::certificate_whitelist,
   $database_max_pool_size            = $puppetdb::params::database_max_pool_size,
@@ -142,6 +143,7 @@
     concurrent_writes                 => $concurrent_writes,
     store_usage                       => $store_usage,
     temp_usage                        => $temp_usage,
+    disable_update_checking           => $disable_update_checking,
     certificate_whitelist_file        => $certificate_whitelist_file,
     certificate_whitelist             => $certificate_whitelist,
     database_max_pool_size            => $database_max_pool_size,

manifests/params.pp

@@ -167,6 +167,7 @@
   $concurrent_writes        = undef
   $store_usage              = undef
   $temp_usage               = undef
+  $disable_update_checking  = undef
 
   $ssl_set_cert_paths       = false
   $ssl_cert_path            = "${ssl_dir}/public.pem"

manifests/server.pp

@@ -65,6 +65,7 @@
   $concurrent_writes                 = $puppetdb::params::concurrent_writes,
   $store_usage                       = $puppetdb::params::store_usage,
   $temp_usage                        = $puppetdb::params::temp_usage,
+  $disable_update_checking           = $puppetdb::params::disable_update_checking,
   $certificate_whitelist_file        = $puppetdb::params::certificate_whitelist_file,
   $certificate_whitelist             = $puppetdb::params::certificate_whitelist,
   $database_max_pool_size            = $puppetdb::params::database_max_pool_size,
@@ -266,6 +267,7 @@
   class { 'puppetdb::server::puppetdb':
     certificate_whitelist_file => $certificate_whitelist_file,
     certificate_whitelist      => $certificate_whitelist,
+    disable_update_checking    => $disable_update_checking,
     confdir                    => $confdir,
     puppetdb_user              => $puppetdb_user,
     puppetdb_group             => $puppetdb_group,

manifests/server/puppetdb.pp

@@ -2,6 +2,7 @@
 class puppetdb::server::puppetdb (
   $certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
   $certificate_whitelist      = $puppetdb::params::certificate_whitelist,
+  $disable_update_checking    = $puppetdb::params::disable_update_checking,
   $confdir                    = $puppetdb::params::confdir,
   $puppetdb_user              = $puppetdb::params::puppetdb_user,
   $puppetdb_group             = $puppetdb::params::puppetdb_group,
@@ -44,4 +45,16 @@
     owner   => 0,
     group   => 0,
   }
+
+  if $disable_update_checking {
+    ini_setting { 'puppetdb_disable_update_checking':
+      setting => 'disable-update-checking',
+      value   => $disable_update_checking,
+    }
+  } else {
+    ini_setting { 'puppetdb_disable_update_checking':
+      ensure  => 'absent',
+      setting => 'disable-update-checking',
+    }
+  }
 }

spec/unit/classes/server/puppetdb_ini_spec.rb

@@ -35,6 +35,13 @@
              'group'   => 'puppetdb',
              'mode'    => '0600'
              )}
+      it { should contain_ini_setting('puppetdb_disable_update_checking').
+        with(
+             'ensure'  => 'absent',
+             'path'    => '/etc/puppetlabs/puppetdb/conf.d/puppetdb.ini',
+             'section' => 'puppetdb',
+             'setting' => 'disable-update-checking'
+             )}
     end
 
     describe 'when restricting access to puppetdb' do
@@ -60,5 +67,22 @@
              'content' => "puppetmaster\n"
              )}
     end
+
+		describe 'when enable disable-update-checking' do
+			let(:params) do
+				{
+					'disable_update_checking' => true,
+				}
+			end
+
+      it { should contain_ini_setting('puppetdb_disable_update_checking').
+        with(
+             'ensure'  => 'present',
+             'path'    => '/etc/puppetlabs/puppetdb/conf.d/puppetdb.ini',
+             'section' => 'puppetdb',
+             'setting' => 'disable-update-checking',
+             'value'   => 'true'
+             )}
+		end
   end
 end