handle Python 3

voxpupuli · May 17, 2020 · ae5ad69 · ae5ad69
1 parent 640f347
commit ae5ad69
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/manifests/plugin/cuda.pp b/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'

diff --git a/manifests/plugin/iscdhcp.pp b/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'

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

diff --git a/spec/acceptance/class_plugin_python_spec.rb b/spec/acceptance/class_plugin_python_spec.rb
@@ -27,7 +27,7 @@ class { 'collectd::plugin::csv':}
   context 'trivial pip module connect-time' do
     it 'works idempotently with no errors' do
       pp = <<-EOS
-      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'
         $_pip_provider = 'pip3'
       } else {
@@ -85,7 +85,7 @@ class { 'collectd::plugin::csv':}
 	        ensure => present,
         }
       }
-      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'
         $_pip_provider = 'pip3'
       } else {

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -32,7 +32,7 @@ class { '::collectd': }
       class { '::collectd::plugin::memory': }
 
       # rabbitmq plugin not ported to Python3
-      unless $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
+      unless ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8') or ($facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '20.04') {
         class { '::collectd::plugin::rabbitmq': }
       }
       class { 'collectd::plugin::csv':}

diff --git a/spec/classes/collectd_plugin_rabbitmq_spec.rb b/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