Remove 2018 versioncmp

Author: m0dular

manifests/init.pp

@@ -32,16 +32,7 @@
       class {'pe_databases::pg_repack':
         disable_maintenance => lookup('pe_databases::maintenance::disable_maintenance', {'default_value' => false}),
       }
-      # Do not manage postgresql_settings in 2018.1.0 or newer.
-      if $manage_postgresql_settings and (versioncmp('2018.1.0', $facts['pe_server_version']) > 0) {
-        include pe_databases::postgresql_settings
-        class { 'pe_databases::postgresql_settings::table_settings' :
-          manage_reports_autovacuum_cost_delay    => $pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay,
-          factsets_autovacuum_vacuum_scale_factor => $pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor,
-          reports_autovacuum_vacuum_scale_factor  => $pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor,
-          require                                 => Class['pe_databases::postgresql_settings'],
-        }
-      } elsif $manage_table_settings {
+      if $manage_table_settings {
         # This is to provide for situations, like PE XL,
         # where the pe-puppetdb database does not exist on the PostgreSQL system being tuned.
         # In PE XL, the Master and Replica run PostgreSQL for all databases *except* for pe-puppetdb.

manifests/pg_repack.pp

@@ -29,35 +29,35 @@
 
   pe_databases::collect {'facts':
     disable_maintenance => $disable_maintenance,
-    command            => "${repack} ${repack_jobs} ${facts_tables}",
-    on_cal             => 'Tue,Sat *-*-* 04:30:00',
+    command             => "${repack} ${repack_jobs} ${facts_tables}",
+    on_cal              => 'Tue,Sat *-*-* 04:30:00',
   }
 
   pe_databases::collect {'catalogs':
     disable_maintenance => $disable_maintenance,
-    command            => "${repack} ${repack_jobs} ${catalogs_tables}",
-    on_cal             => 'Sun,Thu *-*-* 04:30:00',
+    command             => "${repack} ${repack_jobs} ${catalogs_tables}",
+    on_cal              => 'Sun,Thu *-*-* 04:30:00',
   }
 
   pe_databases::collect {'other':
     disable_maintenance => $disable_maintenance,
-    command            => "${repack} ${repack_jobs} ${other_tables}",
-    on_cal             => '*-*-20 05:30:00',
+    command             => "${repack} ${repack_jobs} ${other_tables}",
+    on_cal              => '*-*-20 05:30:00',
   }
 
   if versioncmp($facts['pe_server_version'], '2019.7.0') < 0 {
     pe_databases::collect {'reports':
       disable_maintenance => $disable_maintenance,
-      command            => "${repack} ${repack_jobs} ${reports_table}",
-      on_cal             => '*-*-10 05:30:00',
+      command             => "${repack} ${repack_jobs} ${reports_table}",
+      on_cal              => '*-*-10 05:30:00',
     }
   }
 
   if versioncmp($facts['pe_server_version'], '2019.3.0') < 0 {
     pe_databases::collect {'resource_events':
       disable_maintenance => $disable_maintenance,
-      command            => "${repack} ${repack_jobs} ${resource_events_table}",
-      on_cal             => '*-*-15 05:30:00',
+      command             => "${repack} ${repack_jobs} ${resource_events_table}",
+      on_cal              => '*-*-15 05:30:00',
     }
   }