Merge pull request #254 from mullr/ticket/master/pdb-3318-better-node-ttl-defaults

(PDB-3318) Better defaults for node-ttl, node-purge-ttl

Author: mullr

manifests/params.pp

@@ -37,8 +37,8 @@
   $database_max_pool_size = undef
 
   # These settings manage the various auto-deactivation and auto-purge settings
-  $node_ttl               = '0s'
-  $node_purge_ttl         = '0s'
+  $node_ttl               = '7d'
+  $node_purge_ttl         = '14d'
   $report_ttl             = '14d'
 
   $gc_interval            = '60'

spec/unit/classes/server/database_ini_spec.rb

@@ -76,15 +76,15 @@
              'path'    => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
              'section' => 'database',
              'setting' => 'node-ttl',
-             'value'   => '0s'
+             'value'   => '7d'
              )}
       it { should contain_ini_setting('puppetdb_node_purge_ttl').
         with(
              'ensure'  => 'present',
              'path'    => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
              'section' => 'database',
              'setting' => 'node-purge-ttl',
-             'value'   => '0s'
+             'value'   => '14d'
              )}
       it { should contain_ini_setting('puppetdb_report_ttl').
         with(
@@ -185,15 +185,15 @@
              'path'    => '/etc/puppetdb/conf.d/database.ini',
              'section' => 'database',
              'setting' => 'node-ttl',
-             'value'   => '0s'
+             'value'   => '7d'
              )}
       it { should contain_ini_setting('puppetdb_node_purge_ttl').
         with(
              'ensure'  => 'present',
              'path'    => '/etc/puppetdb/conf.d/database.ini',
              'section' => 'database',
              'setting' => 'node-purge-ttl',
-             'value'   => '0s'
+             'value'   => '14d'
              )}
       it { should contain_ini_setting('puppetdb_report_ttl').
         with(