Remove obsolete database config options

Author: smokris

manifests/init.pp

@@ -420,9 +420,7 @@
   Optional[Array] $facts_blacklist         = $puppetdb::params::facts_blacklist,
   $gc_interval                             = $puppetdb::params::gc_interval,
   $node_purge_gc_batch_limit               = $puppetdb::params::node_purge_gc_batch_limit,
-  $log_slow_statements                     = $puppetdb::params::log_slow_statements,
   $conn_max_age                            = $puppetdb::params::conn_max_age,
-  $conn_keep_alive                         = $puppetdb::params::conn_keep_alive,
   $conn_lifetime                           = $puppetdb::params::conn_lifetime,
   $puppetdb_package                        = $puppetdb::params::puppetdb_package,
   $puppetdb_service                        = $puppetdb::params::puppetdb_service,
@@ -438,9 +436,7 @@
   $manage_read_db_password                 = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties       = $puppetdb::params::read_database_jdbc_ssl_properties,
   $read_database_validate                  = $puppetdb::params::read_database_validate,
-  $read_log_slow_statements                = $puppetdb::params::read_log_slow_statements,
   $read_conn_max_age                       = $puppetdb::params::read_conn_max_age,
-  $read_conn_keep_alive                    = $puppetdb::params::read_conn_keep_alive,
   $read_conn_lifetime                      = $puppetdb::params::read_conn_lifetime,
   $confdir                                 = $puppetdb::params::confdir,
   $vardir                                  = $puppetdb::params::vardir,
@@ -499,9 +495,7 @@
     facts_blacklist                   => $facts_blacklist,
     gc_interval                       => $gc_interval,
     node_purge_gc_batch_limit         => $node_purge_gc_batch_limit,
-    log_slow_statements               => $log_slow_statements,
     conn_max_age                      => $conn_max_age,
-    conn_keep_alive                   => $conn_keep_alive,
     conn_lifetime                     => $conn_lifetime,
     puppetdb_package                  => $puppetdb_package,
     puppetdb_service                  => $puppetdb_service,
@@ -519,9 +513,7 @@
     manage_read_db_password           => $manage_read_db_password,
     read_database_jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
     read_database_validate            => $read_database_validate,
-    read_log_slow_statements          => $read_log_slow_statements,
     read_conn_max_age                 => $read_conn_max_age,
-    read_conn_keep_alive              => $read_conn_keep_alive,
     read_conn_lifetime                => $read_conn_lifetime,
     puppetdb_user                     => $puppetdb_user,
     puppetdb_group                    => $puppetdb_group,

manifests/params.pp

@@ -53,9 +53,7 @@
   $gc_interval               = '60'
   $node_purge_gc_batch_limit = '25'
 
-  $log_slow_statements    = '10'
   $conn_max_age           = '60'
-  $conn_keep_alive        = '45'
   $conn_lifetime          = '0'
 
   $max_threads            = undef
@@ -70,9 +68,7 @@
   $manage_read_db_password           = true
   $read_database_jdbc_ssl_properties = ''
   $read_database_validate            = true
-  $read_log_slow_statements          = '10'
   $read_conn_max_age                 = '60'
-  $read_conn_keep_alive              = '45'
   $read_conn_lifetime                = '0'
   $read_database_max_pool_size       = undef
 

manifests/server.pp

@@ -379,9 +379,7 @@
   Optional[Array] $facts_blacklist         = $puppetdb::params::facts_blacklist,
   $gc_interval                             = $puppetdb::params::gc_interval,
   $node_purge_gc_batch_limit               = $puppetdb::params::node_purge_gc_batch_limit,
-  $log_slow_statements                     = $puppetdb::params::log_slow_statements,
   $conn_max_age                            = $puppetdb::params::conn_max_age,
-  $conn_keep_alive                         = $puppetdb::params::conn_keep_alive,
   $conn_lifetime                           = $puppetdb::params::conn_lifetime,
   $puppetdb_package                        = $puppetdb::params::puppetdb_package,
   $puppetdb_service                        = $puppetdb::params::puppetdb_service,
@@ -396,9 +394,7 @@
   $manage_read_db_password                 = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties       = $puppetdb::params::read_database_jdbc_ssl_properties,
   $read_database_validate                  = $puppetdb::params::read_database_validate,
-  $read_log_slow_statements                = $puppetdb::params::read_log_slow_statements,
   $read_conn_max_age                       = $puppetdb::params::read_conn_max_age,
-  $read_conn_keep_alive                    = $puppetdb::params::read_conn_keep_alive,
   $read_conn_lifetime                      = $puppetdb::params::read_conn_lifetime,
   $confdir                                 = $puppetdb::params::confdir,
   $vardir                                  = $puppetdb::params::vardir,
@@ -511,9 +507,7 @@
     facts_blacklist           => $facts_blacklist,
     gc_interval               => $gc_interval,
     node_purge_gc_batch_limit => $node_purge_gc_batch_limit,
-    log_slow_statements       => $log_slow_statements,
     conn_max_age              => $conn_max_age,
-    conn_keep_alive           => $conn_keep_alive,
     conn_lifetime             => $conn_lifetime,
     confdir                   => $confdir,
     puppetdb_user             => $puppetdb_user,
@@ -545,9 +539,7 @@
     ssl_ca_cert_path       => $ssl_ca_cert_path,
     jdbc_ssl_properties    => $read_database_jdbc_ssl_properties,
     database_validate      => $read_database_validate,
-    log_slow_statements    => $read_log_slow_statements,
     conn_max_age           => $read_conn_max_age,
-    conn_keep_alive        => $read_conn_keep_alive,
     conn_lifetime          => $read_conn_lifetime,
     confdir                => $confdir,
     puppetdb_user          => $puppetdb_user,

manifests/server/database.pp

@@ -16,9 +16,7 @@
   $facts_blacklist           = $puppetdb::params::facts_blacklist,
   $gc_interval               = $puppetdb::params::gc_interval,
   $node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
-  $log_slow_statements       = $puppetdb::params::log_slow_statements,
   $conn_max_age              = $puppetdb::params::conn_max_age,
-  $conn_keep_alive           = $puppetdb::params::conn_keep_alive,
   $conn_lifetime             = $puppetdb::params::conn_lifetime,
   $confdir                   = $puppetdb::params::confdir,
   $puppetdb_user             = $puppetdb::params::puppetdb_user,
@@ -70,9 +68,6 @@
     require => $ini_setting_require,
   }
 
-  $classname = 'org.postgresql.Driver'
-  $subprotocol = 'postgresql'
-
   if !empty($jdbc_ssl_properties) {
     $database_suffix = $jdbc_ssl_properties
   }
@@ -109,16 +104,6 @@
     }
   }
 
-  ini_setting { 'puppetdb_classname':
-    setting => 'classname',
-    value   => $classname,
-  }
-
-  ini_setting { 'puppetdb_subprotocol':
-    setting => 'subprotocol',
-    value   => $subprotocol,
-  }
-
   ini_setting { 'puppetdb_pgs':
     setting => 'syntax_pgs',
     value   => true,
@@ -154,21 +139,11 @@
     value   => $report_ttl,
   }
 
-  ini_setting { 'puppetdb_log_slow_statements':
-    setting => 'log-slow-statements',
-    value   => $log_slow_statements,
-  }
-
   ini_setting { 'puppetdb_conn_max_age':
     setting => 'conn-max-age',
     value   => $conn_max_age,
   }
 
-  ini_setting { 'puppetdb_conn_keep_alive':
-    setting => 'conn-keep-alive',
-    value   => $conn_keep_alive,
-  }
-
   ini_setting { 'puppetdb_conn_lifetime':
     setting => 'conn-lifetime',
     value   => $conn_lifetime,

manifests/server/read_database.pp

@@ -10,9 +10,7 @@
   $manage_db_password     = $puppetdb::params::manage_read_db_password,
   $jdbc_ssl_properties    = $puppetdb::params::read_database_jdbc_ssl_properties,
   $database_validate      = $puppetdb::params::read_database_validate,
-  $log_slow_statements    = $puppetdb::params::read_log_slow_statements,
   $conn_max_age           = $puppetdb::params::read_conn_max_age,
-  $conn_keep_alive        = $puppetdb::params::read_conn_keep_alive,
   $conn_lifetime          = $puppetdb::params::read_conn_lifetime,
   $confdir                = $puppetdb::params::confdir,
   $puppetdb_user          = $puppetdb::params::puppetdb_user,
@@ -64,9 +62,6 @@
       require => $ini_setting_require,
     }
 
-    $classname = 'org.postgresql.Driver'
-    $subprotocol = 'postgresql'
-
     if !empty($jdbc_ssl_properties) {
       $database_suffix = $jdbc_ssl_properties
     }
@@ -123,21 +118,11 @@
       value   => $subname,
     }
 
-    ini_setting { 'puppetdb_read_log_slow_statements':
-      setting => 'log-slow-statements',
-      value   => $log_slow_statements,
-    }
-
     ini_setting { 'puppetdb_read_conn_max_age':
       setting => 'conn-max-age',
       value   => $conn_max_age,
     }
 
-    ini_setting { 'puppetdb_read_conn_keep_alive':
-      setting => 'conn-keep-alive',
-      value   => $conn_keep_alive,
-    }
-
     ini_setting { 'puppetdb_read_conn_lifetime':
       setting => 'conn-lifetime',
       value   => $conn_lifetime,

spec/unit/classes/server/database_ini_spec.rb

@@ -45,26 +45,6 @@
             'value'   => 'puppetdb',
           )
       }
-      it {
-        is_expected.to contain_ini_setting('puppetdb_classname')
-          .with(
-            'ensure'  => 'present',
-            'path'    => "#{pdbconfdir}/database.ini",
-            'section' => 'database',
-            'setting' => 'classname',
-            'value'   => 'org.postgresql.Driver',
-          )
-      }
-      it {
-        is_expected.to contain_ini_setting('puppetdb_subprotocol')
-          .with(
-            'ensure'  => 'present',
-            'path'    => "#{pdbconfdir}/database.ini",
-            'section' => 'database',
-            'setting' => 'subprotocol',
-            'value'   => 'postgresql',
-          )
-      }
       it {
         is_expected.to contain_ini_setting('puppetdb_pgs')
           .with(
@@ -135,16 +115,6 @@
             'value'   => '14d',
           )
       }
-      it {
-        is_expected.to contain_ini_setting('puppetdb_log_slow_statements')
-          .with(
-            'ensure'  => 'present',
-            'path'    => "#{pdbconfdir}/database.ini",
-            'section' => 'database',
-            'setting' => 'log-slow-statements',
-            'value'   => 10,
-          )
-      }
       it {
         is_expected.to contain_ini_setting('puppetdb_conn_max_age')
           .with(
@@ -155,16 +125,6 @@
             'value'   => '60',
           )
       }
-      it {
-        is_expected.to contain_ini_setting('puppetdb_conn_keep_alive')
-          .with(
-            'ensure'  => 'present',
-            'path'    => "#{pdbconfdir}/database.ini",
-            'section' => 'database',
-            'setting' => 'conn-keep-alive',
-            'value'   => '45',
-          )
-      }
       it {
         is_expected.to contain_ini_setting('puppetdb_conn_lifetime')
           .with(

spec/unit/classes/server/read_database_ini_spec.rb

@@ -45,26 +45,6 @@
           'value'   => 'puppetdb-read',
         )
     }
-    it {
-      is_expected.to contain_ini_setting('puppetdb_read_classname')
-        .with(
-          'ensure'  => 'present',
-          'path'    => '/etc/puppetlabs/puppetdb/conf.d/read_database.ini',
-          'section' => 'read-database',
-          'setting' => 'classname',
-          'value'   => 'org.postgresql.Driver',
-        )
-    }
-    it {
-      is_expected.to contain_ini_setting('puppetdb_read_subprotocol')
-        .with(
-          'ensure'  => 'present',
-          'path'    => '/etc/puppetlabs/puppetdb/conf.d/read_database.ini',
-          'section' => 'read-database',
-          'setting' => 'subprotocol',
-          'value'   => 'postgresql',
-        )
-    }
     it {
       is_expected.to contain_ini_setting('puppetdb_read_pgs')
         .with(
@@ -85,16 +65,6 @@
           'value'   => '//puppetdb:5432/puppetdb',
         )
     }
-    it {
-      is_expected.to contain_ini_setting('puppetdb_read_log_slow_statements')
-        .with(
-          'ensure'  => 'present',
-          'path'    => '/etc/puppetlabs/puppetdb/conf.d/read_database.ini',
-          'section' => 'read-database',
-          'setting' => 'log-slow-statements',
-          'value'   => 10,
-        )
-    }
     it {
       is_expected.to contain_ini_setting('puppetdb_read_conn_max_age')
         .with(
@@ -105,16 +75,6 @@
           'value'   => '60',
         )
     }
-    it {
-      is_expected.to contain_ini_setting('puppetdb_read_conn_keep_alive')
-        .with(
-          'ensure'  => 'present',
-          'path'    => '/etc/puppetlabs/puppetdb/conf.d/read_database.ini',
-          'section' => 'read-database',
-          'setting' => 'conn-keep-alive',
-          'value'   => '45',
-        )
-    }
     it {
       is_expected.to contain_ini_setting('puppetdb_read_conn_lifetime')
         .with(