diff --git a/spec/classes/collectd_plugin_amqp1_spec.rb b/spec/classes/collectd_plugin_amqp1_spec.rb
index b04348d5..03475f85 100644
--- a/spec/classes/collectd_plugin_amqp1_spec.rb
+++ b/spec/classes/collectd_plugin_amqp1_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::amqp1', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_amqp_spec.rb b/spec/classes/collectd_plugin_amqp_spec.rb
index 7e9e9559..21aedb92 100644
--- a/spec/classes/collectd_plugin_amqp_spec.rb
+++ b/spec/classes/collectd_plugin_amqp_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::amqp', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_apache_instance_spec.rb b/spec/classes/collectd_plugin_apache_instance_spec.rb
index 5b593998..b6509a63 100644
--- a/spec/classes/collectd_plugin_apache_instance_spec.rb
+++ b/spec/classes/collectd_plugin_apache_instance_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::apache::instance', type: :define do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_apache_spec.rb b/spec/classes/collectd_plugin_apache_spec.rb
index 86435561..05555525 100644
--- a/spec/classes/collectd_plugin_apache_spec.rb
+++ b/spec/classes/collectd_plugin_apache_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::apache', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_battery_spec.rb b/spec/classes/collectd_plugin_battery_spec.rb
index 566ac660..57551088 100644
--- a/spec/classes/collectd_plugin_battery_spec.rb
+++ b/spec/classes/collectd_plugin_battery_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::battery', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_bind_spec.rb b/spec/classes/collectd_plugin_bind_spec.rb
index 2aa442ff..471f4596 100644
--- a/spec/classes/collectd_plugin_bind_spec.rb
+++ b/spec/classes/collectd_plugin_bind_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::bind', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_ceph_spec.rb b/spec/classes/collectd_plugin_ceph_spec.rb
index afa76144..3cf5bc4c 100644
--- a/spec/classes/collectd_plugin_ceph_spec.rb
+++ b/spec/classes/collectd_plugin_ceph_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::ceph', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_cgroups_spec.rb b/spec/classes/collectd_plugin_cgroups_spec.rb
index 41930f05..97151251 100644
--- a/spec/classes/collectd_plugin_cgroups_spec.rb
+++ b/spec/classes/collectd_plugin_cgroups_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::cgroups', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_connectivity_spec.rb b/spec/classes/collectd_plugin_connectivity_spec.rb
index ef9a1e9b..318c6f9f 100644
--- a/spec/classes/collectd_plugin_connectivity_spec.rb
+++ b/spec/classes/collectd_plugin_connectivity_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::connectivity', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_cpu_spec.rb b/spec/classes/collectd_plugin_cpu_spec.rb
index 6aacde1a..8061d65d 100644
--- a/spec/classes/collectd_plugin_cpu_spec.rb
+++ b/spec/classes/collectd_plugin_cpu_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::cpu', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_cuda_spec.rb b/spec/classes/collectd_plugin_cuda_spec.rb
index 452ddc64..26e90117 100644
--- a/spec/classes/collectd_plugin_cuda_spec.rb
+++ b/spec/classes/collectd_plugin_cuda_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::cuda', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_curl_spec.rb b/spec/classes/collectd_plugin_curl_spec.rb
index e0f33bc4..5a9924ed 100644
--- a/spec/classes/collectd_plugin_curl_spec.rb
+++ b/spec/classes/collectd_plugin_curl_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::curl', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_dbi_spec.rb b/spec/classes/collectd_plugin_dbi_spec.rb
index 35fe72a5..8cc23be0 100644
--- a/spec/classes/collectd_plugin_dbi_spec.rb
+++ b/spec/classes/collectd_plugin_dbi_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::dbi', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_dcpmm_spec.rb b/spec/classes/collectd_plugin_dcpmm_spec.rb
index ad3c613b..25be1cde 100644
--- a/spec/classes/collectd_plugin_dcpmm_spec.rb
+++ b/spec/classes/collectd_plugin_dcpmm_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::dcpmm', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_df_spec.rb b/spec/classes/collectd_plugin_df_spec.rb
index 934a9e7b..c9e22f89 100644
--- a/spec/classes/collectd_plugin_df_spec.rb
+++ b/spec/classes/collectd_plugin_df_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::df', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_disk_spec.rb b/spec/classes/collectd_plugin_disk_spec.rb
index 73b3870c..86265bd1 100644
--- a/spec/classes/collectd_plugin_disk_spec.rb
+++ b/spec/classes/collectd_plugin_disk_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::disk', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_dns_spec.rb b/spec/classes/collectd_plugin_dns_spec.rb
index 2329192f..2c2b97a9 100644
--- a/spec/classes/collectd_plugin_dns_spec.rb
+++ b/spec/classes/collectd_plugin_dns_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::dns', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_dpdk_telemetry_spec.rb b/spec/classes/collectd_plugin_dpdk_telemetry_spec.rb
index 17268222..bc5c8e83 100644
--- a/spec/classes/collectd_plugin_dpdk_telemetry_spec.rb
+++ b/spec/classes/collectd_plugin_dpdk_telemetry_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::dpdk_telemetry', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_ethstat.rb b/spec/classes/collectd_plugin_ethstat.rb
index 5588f704..c5f14a49 100644
--- a/spec/classes/collectd_plugin_ethstat.rb
+++ b/spec/classes/collectd_plugin_ethstat.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::ethstat', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_exec_spec.rb b/spec/classes/collectd_plugin_exec_spec.rb
index 31ee7e6c..582e8e59 100644
--- a/spec/classes/collectd_plugin_exec_spec.rb
+++ b/spec/classes/collectd_plugin_exec_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::exec', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_fhcount_spec.rb b/spec/classes/collectd_plugin_fhcount_spec.rb
index d6e63698..be5c7d5d 100644
--- a/spec/classes/collectd_plugin_fhcount_spec.rb
+++ b/spec/classes/collectd_plugin_fhcount_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::fhcount', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_filecount_spec.rb b/spec/classes/collectd_plugin_filecount_spec.rb
index 59245b56..d2d42d90 100644
--- a/spec/classes/collectd_plugin_filecount_spec.rb
+++ b/spec/classes/collectd_plugin_filecount_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::filecount', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_filter_spec.rb b/spec/classes/collectd_plugin_filter_spec.rb
index 51c9134e..6f3257a8 100644
--- a/spec/classes/collectd_plugin_filter_spec.rb
+++ b/spec/classes/collectd_plugin_filter_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::filter', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_genericjmx_spec.rb b/spec/classes/collectd_plugin_genericjmx_spec.rb
index d243856c..44badadb 100644
--- a/spec/classes/collectd_plugin_genericjmx_spec.rb
+++ b/spec/classes/collectd_plugin_genericjmx_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::genericjmx', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       options = os_specific_options(facts)
       let :facts do
diff --git a/spec/classes/collectd_plugin_hddtemp_spec.rb b/spec/classes/collectd_plugin_hddtemp_spec.rb
index 0cc5a065..cd0a2206 100644
--- a/spec/classes/collectd_plugin_hddtemp_spec.rb
+++ b/spec/classes/collectd_plugin_hddtemp_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::hddtemp', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_hugepages_spec.rb b/spec/classes/collectd_plugin_hugepages_spec.rb
index 58e549f7..7d19730a 100644
--- a/spec/classes/collectd_plugin_hugepages_spec.rb
+++ b/spec/classes/collectd_plugin_hugepages_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::hugepages', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_intel_pmu_spec.rb b/spec/classes/collectd_plugin_intel_pmu_spec.rb
index 620287ca..77c48a78 100644
--- a/spec/classes/collectd_plugin_intel_pmu_spec.rb
+++ b/spec/classes/collectd_plugin_intel_pmu_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::intel_pmu', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_intel_rdt_spec.rb b/spec/classes/collectd_plugin_intel_rdt_spec.rb
index 85fd0ebd..e8fa4041 100644
--- a/spec/classes/collectd_plugin_intel_rdt_spec.rb
+++ b/spec/classes/collectd_plugin_intel_rdt_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::intel_rdt', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_interface_spec.rb b/spec/classes/collectd_plugin_interface_spec.rb
index 5e327185..8c7b1ce6 100644
--- a/spec/classes/collectd_plugin_interface_spec.rb
+++ b/spec/classes/collectd_plugin_interface_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::interface', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_ipmi.rb b/spec/classes/collectd_plugin_ipmi.rb
index 9a6dd113..a8530e98 100644
--- a/spec/classes/collectd_plugin_ipmi.rb
+++ b/spec/classes/collectd_plugin_ipmi.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::ipmi', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       options = os_specific_options(facts)
       let :facts do
diff --git a/spec/classes/collectd_plugin_iptables_spec.rb b/spec/classes/collectd_plugin_iptables_spec.rb
index 8ca16bb5..322ccf8a 100644
--- a/spec/classes/collectd_plugin_iptables_spec.rb
+++ b/spec/classes/collectd_plugin_iptables_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::iptables', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_irq_spec.rb b/spec/classes/collectd_plugin_irq_spec.rb
index 4ccfdfbf..9eb536ea 100644
--- a/spec/classes/collectd_plugin_irq_spec.rb
+++ b/spec/classes/collectd_plugin_irq_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::irq', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_iscdhcp_spec.rb b/spec/classes/collectd_plugin_iscdhcp_spec.rb
index 452ddc64..26e90117 100644
--- a/spec/classes/collectd_plugin_iscdhcp_spec.rb
+++ b/spec/classes/collectd_plugin_iscdhcp_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::cuda', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_java_spec.rb b/spec/classes/collectd_plugin_java_spec.rb
index ac2701b1..24bbc82a 100644
--- a/spec/classes/collectd_plugin_java_spec.rb
+++ b/spec/classes/collectd_plugin_java_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::java', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_load_spec.rb b/spec/classes/collectd_plugin_load_spec.rb
index 21abad9a..d3882810 100644
--- a/spec/classes/collectd_plugin_load_spec.rb
+++ b/spec/classes/collectd_plugin_load_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::load', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_logfile_spec.rb b/spec/classes/collectd_plugin_logfile_spec.rb
index 92f068ae..a798c795 100644
--- a/spec/classes/collectd_plugin_logfile_spec.rb
+++ b/spec/classes/collectd_plugin_logfile_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::logfile', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_logparser_spec.rb b/spec/classes/collectd_plugin_logparser_spec.rb
index 2d066b18..855e442b 100644
--- a/spec/classes/collectd_plugin_logparser_spec.rb
+++ b/spec/classes/collectd_plugin_logparser_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::logparser', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_mcelog_spec.rb b/spec/classes/collectd_plugin_mcelog_spec.rb
index 8cc47abb..e126f43e 100644
--- a/spec/classes/collectd_plugin_mcelog_spec.rb
+++ b/spec/classes/collectd_plugin_mcelog_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::mcelog', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_memcached_spec.rb b/spec/classes/collectd_plugin_memcached_spec.rb
index 6fec926a..e5396aec 100644
--- a/spec/classes/collectd_plugin_memcached_spec.rb
+++ b/spec/classes/collectd_plugin_memcached_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::memcached', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_memory_spec.rb b/spec/classes/collectd_plugin_memory_spec.rb
index 596aaa65..22eee85d 100644
--- a/spec/classes/collectd_plugin_memory_spec.rb
+++ b/spec/classes/collectd_plugin_memory_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::memory', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_mongodb_spec.rb b/spec/classes/collectd_plugin_mongodb_spec.rb
index 8c795182..cdc4a154 100644
--- a/spec/classes/collectd_plugin_mongodb_spec.rb
+++ b/spec/classes/collectd_plugin_mongodb_spec.rb
@@ -14,7 +14,7 @@
     }
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_mysql_database_spec.rb b/spec/classes/collectd_plugin_mysql_database_spec.rb
index 011aa530..ac9abee7 100644
--- a/spec/classes/collectd_plugin_mysql_database_spec.rb
+++ b/spec/classes/collectd_plugin_mysql_database_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::mysql::database', type: :define do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_netlink_spec.rb b/spec/classes/collectd_plugin_netlink_spec.rb
index cf53fff3..446ce034 100644
--- a/spec/classes/collectd_plugin_netlink_spec.rb
+++ b/spec/classes/collectd_plugin_netlink_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::netlink', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_network_spec.rb b/spec/classes/collectd_plugin_network_spec.rb
index 92702d7b..7a3e0828 100644
--- a/spec/classes/collectd_plugin_network_spec.rb
+++ b/spec/classes/collectd_plugin_network_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::network', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_numa_spec.rb b/spec/classes/collectd_plugin_numa_spec.rb
index d29f0fd4..cbc6ae58 100644
--- a/spec/classes/collectd_plugin_numa_spec.rb
+++ b/spec/classes/collectd_plugin_numa_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::numa', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_nut_spec.rb b/spec/classes/collectd_plugin_nut_spec.rb
index 50653460..fb518a1f 100644
--- a/spec/classes/collectd_plugin_nut_spec.rb
+++ b/spec/classes/collectd_plugin_nut_spec.rb
@@ -7,7 +7,7 @@
     'include collectd'
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_openldap_spec.rb b/spec/classes/collectd_plugin_openldap_spec.rb
index 72476850..90826b38 100644
--- a/spec/classes/collectd_plugin_openldap_spec.rb
+++ b/spec/classes/collectd_plugin_openldap_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::openldap', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_openvpn_spec.rb b/spec/classes/collectd_plugin_openvpn_spec.rb
index fb66abe2..cc8582fa 100644
--- a/spec/classes/collectd_plugin_openvpn_spec.rb
+++ b/spec/classes/collectd_plugin_openvpn_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::openvpn', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_oracle_spec.rb b/spec/classes/collectd_plugin_oracle_spec.rb
index 224d1287..9769881a 100644
--- a/spec/classes/collectd_plugin_oracle_spec.rb
+++ b/spec/classes/collectd_plugin_oracle_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::oracle', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       options = os_specific_options(facts)
       let :facts do
diff --git a/spec/classes/collectd_plugin_ovs_events_spec.rb b/spec/classes/collectd_plugin_ovs_events_spec.rb
index f1bc1c73..e9599203 100644
--- a/spec/classes/collectd_plugin_ovs_events_spec.rb
+++ b/spec/classes/collectd_plugin_ovs_events_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::ovs_events', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_ovs_stats_spec.rb b/spec/classes/collectd_plugin_ovs_stats_spec.rb
index 0d5ef0b1..321fd506 100644
--- a/spec/classes/collectd_plugin_ovs_stats_spec.rb
+++ b/spec/classes/collectd_plugin_ovs_stats_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::ovs_stats', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_pcie_errors_spec.rb b/spec/classes/collectd_plugin_pcie_errors_spec.rb
index f0234a63..2195c0ac 100644
--- a/spec/classes/collectd_plugin_pcie_errors_spec.rb
+++ b/spec/classes/collectd_plugin_pcie_errors_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::pcie_errors', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_ping_spec.rb b/spec/classes/collectd_plugin_ping_spec.rb
index fda722ac..e78cf684 100644
--- a/spec/classes/collectd_plugin_ping_spec.rb
+++ b/spec/classes/collectd_plugin_ping_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::ping', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_postgresql_spec.rb b/spec/classes/collectd_plugin_postgresql_spec.rb
index 94a0dc9a..67066dea 100644
--- a/spec/classes/collectd_plugin_postgresql_spec.rb
+++ b/spec/classes/collectd_plugin_postgresql_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::postgresql', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_powerdns_spec.rb b/spec/classes/collectd_plugin_powerdns_spec.rb
index 01e9098a..6a0d65a0 100644
--- a/spec/classes/collectd_plugin_powerdns_spec.rb
+++ b/spec/classes/collectd_plugin_powerdns_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::powerdns', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_processes_spec.rb b/spec/classes/collectd_plugin_processes_spec.rb
index 9d60da36..d5618d1d 100644
--- a/spec/classes/collectd_plugin_processes_spec.rb
+++ b/spec/classes/collectd_plugin_processes_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::processes', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_procevent_spec.rb b/spec/classes/collectd_plugin_procevent_spec.rb
index 662b1d2e..52250cbc 100644
--- a/spec/classes/collectd_plugin_procevent_spec.rb
+++ b/spec/classes/collectd_plugin_procevent_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::procevent', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_protocols_spec.rb b/spec/classes/collectd_plugin_protocols_spec.rb
index 21f70e44..fc9de361 100644
--- a/spec/classes/collectd_plugin_protocols_spec.rb
+++ b/spec/classes/collectd_plugin_protocols_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::protocols', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_python_spec.rb b/spec/classes/collectd_plugin_python_spec.rb
index 67910c55..6079dca5 100644
--- a/spec/classes/collectd_plugin_python_spec.rb
+++ b/spec/classes/collectd_plugin_python_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::python', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_rabbitmq_spec.rb b/spec/classes/collectd_plugin_rabbitmq_spec.rb
index 63546f67..d3e8c161 100644
--- a/spec/classes/collectd_plugin_rabbitmq_spec.rb
+++ b/spec/classes/collectd_plugin_rabbitmq_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::rabbitmq', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_redis_spec.rb b/spec/classes/collectd_plugin_redis_spec.rb
index d0a7b09e..485257ba 100644
--- a/spec/classes/collectd_plugin_redis_spec.rb
+++ b/spec/classes/collectd_plugin_redis_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::redis', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_rrdtool_spec.rb b/spec/classes/collectd_plugin_rrdtool_spec.rb
index 262d218a..19d9fba0 100644
--- a/spec/classes/collectd_plugin_rrdtool_spec.rb
+++ b/spec/classes/collectd_plugin_rrdtool_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::rrdtool', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_smart_spec.rb b/spec/classes/collectd_plugin_smart_spec.rb
index a64b8000..d268e683 100644
--- a/spec/classes/collectd_plugin_smart_spec.rb
+++ b/spec/classes/collectd_plugin_smart_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::smart', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_snmp_agent_spec.rb b/spec/classes/collectd_plugin_snmp_agent_spec.rb
index 012ba176..a8d81ea9 100644
--- a/spec/classes/collectd_plugin_snmp_agent_spec.rb
+++ b/spec/classes/collectd_plugin_snmp_agent_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::snmp_agent', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_snmp_spec.rb b/spec/classes/collectd_plugin_snmp_spec.rb
index d0569dc3..fa33dbe1 100644
--- a/spec/classes/collectd_plugin_snmp_spec.rb
+++ b/spec/classes/collectd_plugin_snmp_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::snmp', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_statsd_spec.rb b/spec/classes/collectd_plugin_statsd_spec.rb
index 693744d1..d4f0fcac 100644
--- a/spec/classes/collectd_plugin_statsd_spec.rb
+++ b/spec/classes/collectd_plugin_statsd_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::statsd', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_swap_spec.rb b/spec/classes/collectd_plugin_swap_spec.rb
index 4b842f6c..3cbf4822 100644
--- a/spec/classes/collectd_plugin_swap_spec.rb
+++ b/spec/classes/collectd_plugin_swap_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::swap', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_sysevent_spec.rb b/spec/classes/collectd_plugin_sysevent_spec.rb
index fd3a5e16..b29b223d 100644
--- a/spec/classes/collectd_plugin_sysevent_spec.rb
+++ b/spec/classes/collectd_plugin_sysevent_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::sysevent', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_syslog_spec.rb b/spec/classes/collectd_plugin_syslog_spec.rb
index ac5c4a68..cc4d38d6 100644
--- a/spec/classes/collectd_plugin_syslog_spec.rb
+++ b/spec/classes/collectd_plugin_syslog_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::syslog', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_table_spec.rb b/spec/classes/collectd_plugin_table_spec.rb
index 82d28fa2..4b7b22e6 100644
--- a/spec/classes/collectd_plugin_table_spec.rb
+++ b/spec/classes/collectd_plugin_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::table', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_tail_csv_spec.rb b/spec/classes/collectd_plugin_tail_csv_spec.rb
index 131631da..4ea239c4 100644
--- a/spec/classes/collectd_plugin_tail_csv_spec.rb
+++ b/spec/classes/collectd_plugin_tail_csv_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::tail_csv', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_tcpconns_spec.rb b/spec/classes/collectd_plugin_tcpconns_spec.rb
index 42c4bd2d..50c9faac 100644
--- a/spec/classes/collectd_plugin_tcpconns_spec.rb
+++ b/spec/classes/collectd_plugin_tcpconns_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::tcpconns', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_thermal_spec.rb b/spec/classes/collectd_plugin_thermal_spec.rb
index b4f655d9..502c0893 100644
--- a/spec/classes/collectd_plugin_thermal_spec.rb
+++ b/spec/classes/collectd_plugin_thermal_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::thermal', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_threshold_spec.rb b/spec/classes/collectd_plugin_threshold_spec.rb
index 43d3e07e..ae012310 100644
--- a/spec/classes/collectd_plugin_threshold_spec.rb
+++ b/spec/classes/collectd_plugin_threshold_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::threshold', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_turbostat_spec.rb b/spec/classes/collectd_plugin_turbostat_spec.rb
index a5c87750..fbffcb48 100644
--- a/spec/classes/collectd_plugin_turbostat_spec.rb
+++ b/spec/classes/collectd_plugin_turbostat_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::turbostat', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_unixsock_spec.rb b/spec/classes/collectd_plugin_unixsock_spec.rb
index f48c5d91..4f7175ab 100644
--- a/spec/classes/collectd_plugin_unixsock_spec.rb
+++ b/spec/classes/collectd_plugin_unixsock_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::unixsock', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_uuid_spec.rb b/spec/classes/collectd_plugin_uuid_spec.rb
index be2be1ca..46b782b2 100644
--- a/spec/classes/collectd_plugin_uuid_spec.rb
+++ b/spec/classes/collectd_plugin_uuid_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::uuid', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_varnish_spec.rb b/spec/classes/collectd_plugin_varnish_spec.rb
index f9c0a3b8..e2902bfc 100644
--- a/spec/classes/collectd_plugin_varnish_spec.rb
+++ b/spec/classes/collectd_plugin_varnish_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::varnish', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_virt_spec.rb b/spec/classes/collectd_plugin_virt_spec.rb
index 5a53aae8..de1b1c54 100644
--- a/spec/classes/collectd_plugin_virt_spec.rb
+++ b/spec/classes/collectd_plugin_virt_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::virt', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_write_graphite_spec.rb b/spec/classes/collectd_plugin_write_graphite_spec.rb
index e4df9d80..942b3a47 100644
--- a/spec/classes/collectd_plugin_write_graphite_spec.rb
+++ b/spec/classes/collectd_plugin_write_graphite_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::write_graphite', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts.merge(collectd_version: '5.0')
diff --git a/spec/classes/collectd_plugin_write_http_spec.rb b/spec/classes/collectd_plugin_write_http_spec.rb
index 4a363694..af179aa5 100644
--- a/spec/classes/collectd_plugin_write_http_spec.rb
+++ b/spec/classes/collectd_plugin_write_http_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::write_http', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_write_kafka_spec.rb b/spec/classes/collectd_plugin_write_kafka_spec.rb
index ca0c1e9f..0e5ac8fb 100644
--- a/spec/classes/collectd_plugin_write_kafka_spec.rb
+++ b/spec/classes/collectd_plugin_write_kafka_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::write_kafka', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_write_log_spec.rb b/spec/classes/collectd_plugin_write_log_spec.rb
index 36cd03b1..d3e67a49 100644
--- a/spec/classes/collectd_plugin_write_log_spec.rb
+++ b/spec/classes/collectd_plugin_write_log_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::write_log', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_write_prometheus_spec.rb b/spec/classes/collectd_plugin_write_prometheus_spec.rb
index 4ae5b405..ca988105 100644
--- a/spec/classes/collectd_plugin_write_prometheus_spec.rb
+++ b/spec/classes/collectd_plugin_write_prometheus_spec.rb
@@ -6,7 +6,7 @@
   ip = '192.0.0.1'
   port = 9103
   host_opt_min_collectd_ver = '5.9'
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts.merge(collectd_version: '5.7')
diff --git a/spec/classes/collectd_plugin_write_riemann_spec.rb b/spec/classes/collectd_plugin_write_riemann_spec.rb
index 32867039..81def5a7 100644
--- a/spec/classes/collectd_plugin_write_riemann_spec.rb
+++ b/spec/classes/collectd_plugin_write_riemann_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::write_riemann', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_write_tsdb_spec.rb b/spec/classes/collectd_plugin_write_tsdb_spec.rb
index aa1e68a3..b9975092 100644
--- a/spec/classes/collectd_plugin_write_tsdb_spec.rb
+++ b/spec/classes/collectd_plugin_write_tsdb_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::write_tsdb', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/classes/collectd_plugin_zfs_arc_spec.rb b/spec/classes/collectd_plugin_zfs_arc_spec.rb
index 13236438..7e8c3d64 100644
--- a/spec/classes/collectd_plugin_zfs_arc_spec.rb
+++ b/spec/classes/collectd_plugin_zfs_arc_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::zfs_arc', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts.merge(collectd_version: '4.8')
diff --git a/spec/classes/collectd_plugin_zookeeper_spec.rb b/spec/classes/collectd_plugin_zookeeper_spec.rb
index 18124dd8..7ad35d40 100644
--- a/spec/classes/collectd_plugin_zookeeper_spec.rb
+++ b/spec/classes/collectd_plugin_zookeeper_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'collectd::plugin::zookeeper', type: :class do
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
diff --git a/spec/spec_helper_methods.rb b/spec/spec_helper_methods.rb
index b2557071..745ad24b 100644
--- a/spec/spec_helper_methods.rb
+++ b/spec/spec_helper_methods.rb
@@ -16,14 +16,3 @@ def os_specific_options(facts)
     { package: 'collectd', service: 'collectd', plugin_conf_dir: '/etc/collectd' }
   end
 end
-
-def baseline_os_hash
-  {
-    supported_os: [
-      {
-        'operatingsystem' => 'CentOS',
-        'operatingsystemrelease' => %w[7 8]
-      }
-    ]
-  }
-end