Merge pull request #941 from bastelfreak/ubuntu20

Add ubuntu 20 support

Author: bastelfreak

manifests/plugin/cuda.pp

@@ -20,7 +20,7 @@
   include collectd
 
   $_manage_package = pick($manage_package, $collectd::manage_package)
-  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
+  if ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8') or ($facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '20.04') {
     $_python_pip_package = 'python3-pip'
     if $package_provider =~ Undef {
       $_package_provider = 'pip3'

manifests/plugin/iscdhcp.pp

@@ -20,7 +20,7 @@
 
   $_manage_package = pick($manage_package, $collectd::manage_package)
 
-  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
+  if ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8') or ($facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '20.04') {
     $_python_pip_package = 'python3-pip'
     if $package_provider =~ Undef {
       $_package_provider = 'pip3'

manifests/plugin/rabbitmq.pp

@@ -62,7 +62,8 @@
   include collectd
 
   if $facts['os']['family'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') >= 0 or
-    $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 {
+  $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 or
+  $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0 {
     fail('https://pypi.org/project/collectd-rabbitmq/ does not support Python 3')
   }
 

metadata.json

@@ -69,7 +69,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     },
     {

spec/classes/collectd_plugin_rabbitmq_spec.rb

@@ -24,7 +24,7 @@
           end
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 8]
+          when %w[RedHat 8], %w[Ubuntu 20.04]
             it { is_expected.to raise_error(%r{does not support Python 3}) }
           else
             it 'import collectd_rabbitmq.collectd_plugin in python-config' do
@@ -67,7 +67,7 @@
           end
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 8]
+          when %w[RedHat 8], %w[Ubuntu 20.04]
             it { is_expected.to raise_error(%r{does not support Python 3}) }
           else
             it 'override custom TypesDB' do
@@ -82,7 +82,7 @@
           end
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 8]
+          when %w[RedHat 8], %w[Ubuntu 20.04]
             it { is_expected.to raise_error(%r{does not support Python 3}) }
           else
             it 'override Username to foo in python-config' do
@@ -97,7 +97,7 @@
           end
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 8]
+          when %w[RedHat 8], %w[Ubuntu 20.04]
             it { is_expected.to raise_error(%r{does not support Python 3}) }
           else
             it 'override Username to foo in python-config' do
@@ -112,7 +112,7 @@
           end
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 8]
+          when %w[RedHat 8], %w[Ubuntu 20.04]
             it { is_expected.to raise_error(%r{does not support Python 3}) }
           else
             it 'override Username to foo in python-config' do
@@ -128,7 +128,7 @@
         end
 
         case [facts[:os]['family'], facts[:os]['release']['major']]
-        when %w[RedHat 8]
+        when %w[RedHat 8], %w[Ubuntu 20.04]
           it { is_expected.to raise_error(%r{does not support Python 3}) }
         else
           it 'Will remove python-config' do
@@ -155,7 +155,7 @@
                     end
 
                     case [facts[:os]['family'], facts[:os]['release']['major']]
-                    when %w[RedHat 8]
+                    when %w[RedHat 8], %w[Ubuntu 20.04]
                       it { is_expected.to raise_error(%r{does not support Python 3}) }
                     else
                       it do

spec/spec_helper_methods.rb

@@ -15,32 +15,6 @@ def os_specific_options(facts)
   end
 end
 
-def all_supported_os_hash
-  {
-    supported_os: [
-      {
-        'operatingsystem' => 'Debian',
-        'operatingsystemrelease' => ['8']
-      },
-      {
-        'operatingsystem' => 'CentOS',
-        'operatingsystemrelease' => %w[7 8]
-      },
-      {
-        'operatingsystem' => 'Ubuntu',
-        'operatingsystemrelease' => %w[16.04 18.04]
-      },
-      {
-        'operatingsystem' => 'FreeBSD',
-        'operatingsystemrelease' => %w[11 12]
-      },
-      {
-        'operatingsystem' => 'Archlinux'
-      }
-    ]
-  }
-end
-
 def baseline_os_hash
   {
     supported_os: [