Merge 7ec7303 into 6d74352

voxpupuli · Mar 6, 2020 · 3b41cc7 · 3b41cc7
2 parents 6d74352 + 7ec7303
commit 3b41cc7
Show file tree

Hide file tree

Showing 12 changed files with 126 additions and 65 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -3,7 +3,7 @@ fixtures:
     apt: https://github.com/puppetlabs/puppetlabs-apt.git
     stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
     concat: https://github.com/puppetlabs/puppetlabs-concat.git
-    epel: https://github.com/stahnma/puppet-module-epel.git
+    epel: https://github.com/voxpupuli/puppet-epel.git
     yumrepo_core:
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
       puppet_version: ">= 6.0.0"
diff --git a/.sync.yml b/.sync.yml
@@ -4,6 +4,7 @@
     - set: ubuntu1604-64
     - set: ubuntu1804-64
     - set: centos7-64
+    - set: centos8-64
     - set: debian8-64
   secure: "FAK3Izs5bSZyblGvcFnGWm0exZV5+v9pbwfRDD2oihWxX3U3pArGW+3XcwcJfLQgrUYBsOTmHC8yPjlgTBYeIt/5pvg9X+3jwNgeto6kozpI/nvAq4NtcHhzxRejuPELhFYeXZ3hEw0w+v/ZRo2cNLwI0LLpiWEDvCMZN1CJ2RY="
 spec/spec_helper.rb:

diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,14 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -36,6 +36,7 @@
   Optional[Integer] $write_queue_limit_high            = $collectd::params::write_queue_limit_high,
   Optional[Integer] $write_queue_limit_low             = $collectd::params::write_queue_limit_low,
   Integer[1] $write_threads                            = $collectd::params::write_threads,
+  String[1] $python_pip_package                        = $collectd::params::python_pip_package,
 ) inherits collectd::params {
 
   $collectd_version_real = pick_default($facts['collectd_version'], $minimum_version)

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -48,6 +48,7 @@
       $default_python_dir = '/usr/local/lib/python2.7/dist-packages'
       $manage_repo        = $facts['os']['release']['full'] != '18.04'
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
     'Solaris': {
       $package_name       = 'CSWcollectd'
@@ -61,6 +62,7 @@
       $default_python_dir = '/opt/csw/share/collectd/python'
       $manage_repo        = false
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
     'RedHat': {
       $package_name       = 'collectd'
@@ -71,14 +73,21 @@
       $config_file        = '/etc/collectd.conf'
       $config_group       = 'root'
       $java_dir           = '/usr/share/collectd/java'
-      $default_python_dir = '/usr/lib/python2.7/site-packages'
+      $default_python_dir = $facts['os']['release']['major'] ? {
+        '7'     => '/usr/lib/python2.7/site-packages',
+        default => '/usr/lib/python3.6/site-packages',
+      }
       $manage_repo        = true
       $package_configs    = {
         ovs_events => 'ovs-events.conf',
         ovs_stats => 'ovs-stats.conf',
         processes => 'processes-config.conf',
         virt => 'libvirt.conf',
       }
+      $python_pip_package = $facts['os']['release']['major'] ? {
+        '7'     => 'python-pip',
+        default => 'python3-pip',
+      }
     }
     'Suse': {
       $package_name       = 'collectd'
@@ -92,6 +101,7 @@
       $default_python_dir = '/usr/share/collectd/python'
       $manage_repo        = false
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
     'FreeBSD': {
       $package_name       = 'collectd5'
@@ -105,6 +115,7 @@
       $default_python_dir = '/usr/local/share/collectd/python'
       $manage_repo        = false
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
     'OpenBSD': {
       $package_name       = 'collectd'
@@ -118,6 +129,7 @@
       $default_python_dir = '/usr/local/share/collectd/python'
       $manage_repo        = false
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
     'Archlinux': {
       $package_name       = 'collectd'
@@ -131,6 +143,7 @@
       $default_python_dir = '/usr/share/collectd/python'
       $manage_repo        = false
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
     'Gentoo': {
       $package_name       = 'app-admin/collectd'
@@ -144,6 +157,7 @@
       $default_python_dir = '/usr/share/collectd/python'
       $manage_repo        = false
       $package_configs    = {}
+      $python_pip_package = 'python-pip'
     }
 
     default: {

diff --git a/manifests/plugin/cuda.pp b/manifests/plugin/cuda.pp
@@ -10,30 +10,33 @@
 # @param package_name Optional[String] Name of plugin package to install. Default: collectd-cuda
 # @param package_provider Optional[String] Passed to package resource. Default: pip
 # @param provider_proxy Optional[String] Proxy for provider. Default: undef
+# @param python_pip_package Optional[String[1]] Name of python-pip package. Default undef
 class collectd::plugin::cuda (
-  Optional[String] $ensure           = 'present',
-  Optional[Boolean] $manage_package   = undef,
-  Optional[String] $package_name     = 'collectd-cuda',
-  Optional[String] $package_provider = 'pip',
-  Optional[String] $provider_proxy   = undef,
+  Optional[String] $ensure                = 'present',
+  Optional[Boolean] $manage_package       = undef,
+  Optional[String] $package_name          = 'collectd-cuda',
+  Optional[String] $package_provider      = 'pip',
+  Optional[String] $provider_proxy        = undef,
+  Optional[String[1]] $python_pip_package = undef,
 ) {
   include collectd
 
   $_manage_package = pick($manage_package, $collectd::manage_package)
+  $_python_pip_package = pick($python_pip_package, $collectd::python_pip_package)
 
   if ($_manage_package) {
-    if (!defined(Package['python-pip'])) {
-      package { 'python-pip': ensure => 'present', }
+    if (!defined(Package[$_python_pip_package])) {
+      package { $_python_pip_package: ensure => 'present', }
 
       Package[$package_name] {
-        require => Package['python-pip'],
+        require => Package[$_python_pip_package],
       }
 
       if $facts['os']['family'] == 'RedHat' {
         # Epel is installed in install.pp if manage_repo is true
         # python-pip doesn't exist in base for RedHat. Need epel installed first
         if (defined(Class['::epel'])) {
-          Package['python-pip'] {
+          Package[$_python_pip_package] {
             require => Class['::epel'],
           }
         }

diff --git a/manifests/plugin/iscdhcp.pp b/manifests/plugin/iscdhcp.pp
@@ -9,30 +9,33 @@
 # @param package_name Optional[String] Name of plugin package to install. Default: collectd-iscdhcp
 # @param package_provider Optional[String] Passed to package resource. Default: pip
 # @param provider_proxy Optional[String] Proxy for provider. Default: undef
+# @param python_pip_package Optional[String[1]] Name of python-pip package. Default undef
 class collectd::plugin::iscdhcp (
-  Optional[String] $ensure           = 'present',
-  Optional[Boolean] $manage_package   = undef,
-  Optional[String] $package_name     = 'collectd-iscdhcp',
-  Optional[String] $package_provider = 'pip',
-  Optional[String] $provider_proxy   = undef,
+  Optional[String] $ensure                = 'present',
+  Optional[Boolean] $manage_package       = undef,
+  Optional[String] $package_name          = 'collectd-iscdhcp',
+  Optional[String] $package_provider      = 'pip',
+  Optional[String] $provider_proxy        = undef,
+  Optional[String[1]] $python_pip_package = undef,
 ) {
   include collectd
 
   $_manage_package = pick($manage_package, $collectd::manage_package)
+  $_python_pip_package = pick($python_pip_package, $collectd::python_pip_package)
 
   if ($_manage_package) {
-    if (!defined(Package['python-pip'])) {
-      package { 'python-pip': ensure => 'present', }
+    if (!defined(Package[$_python_pip_package])) {
+      package { $_python_pip_package: ensure => 'present', }
 
       Package[$package_name] {
-        require => Package['python-pip'],
+        require => Package[$_python_pip_package],
       }
 
       if $facts['os']['family'] == 'RedHat' {
         # Epel is installed in install.pp if manage_repo is true
         # python-pip doesn't exist in base for RedHat. Need epel installed first
         if (defined(Class['::epel'])) {
-          Package['python-pip'] {
+          Package[$_python_pip_package] {
             require => Class['::epel'],
           }
         }

diff --git a/manifests/plugin/rabbitmq.pp b/manifests/plugin/rabbitmq.pp
@@ -27,6 +27,11 @@
 #   Passed to package resource
 #   Default: pip
 #
+# [*python_pip_package*]
+#   String[1]
+#   Name of the python-pip package
+#   Default: undef
+#
 # [*config*]
 #   Hash
 #   Contains key/value passed to the python module to configure the plugin
@@ -42,7 +47,7 @@
 #
 class collectd::plugin::rabbitmq (
   # lint:ignore:parameter_order
-  Hash $config      = {
+  Hash $config                            = {
     'Username' => 'guest',
     'Password' => 'guest',
     'Scheme'   => 'http',
@@ -51,16 +56,19 @@
     'Realm'    => '"RabbitMQ Management"',
   },
   # lint:endignore
-  String $ensure    = 'present',
-  $interval         = undef,
-  $manage_package   = undef,
-  $package_name     = 'collectd-rabbitmq',
-  $package_provider = 'pip',
-  $provider_proxy   = undef,
-  $custom_types_db  = undef,
+  String $ensure                          = 'present',
+  $interval                               = undef,
+  $manage_package                         = undef,
+  $package_name                           = 'collectd-rabbitmq',
+  $package_provider                       = 'pip',
+  $provider_proxy                         = undef,
+  $custom_types_db                        = undef,
+  Optional[String[1]] $python_pip_package = undef,
 ) {
   include collectd
 
+  $_python_pip_package = pick($python_pip_package, $collectd::python_pip_package)
+
   case $facts['os']['family'] {
     'RedHat': {
       $_custom_types_db = '/usr/share/collectd-rabbitmq/types.db.custom'
@@ -74,18 +82,18 @@
   $_manage_package = pick($manage_package, $collectd::manage_package)
 
   if ($_manage_package) {
-    if (!defined(Package['python-pip'])) {
-      package { 'python-pip': ensure => 'present', }
+    if (!defined(Package[$_python_pip_package])) {
+      package { $_python_pip_package: ensure => 'present', }
 
       Package[$package_name] {
-        require => Package['python-pip'],
+        require => Package[$_python_pip_package],
       }
 
       if $facts['os']['family'] == 'RedHat' {
         # Epel is installed in install.pp if manage_repo is true
         # python-pip doesn't exist in base for RedHat. Need epel installed first
         if (defined(Class['::epel'])) {
-          Package['python-pip'] {
+          Package[$_python_pip_package] {
             require => Class['::epel'],
           }
         }

diff --git a/metadata.json b/metadata.json
@@ -3,19 +3,22 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
@@ -84,8 +87,8 @@
       "version_requirement": ">= 4.25.0 < 7.0.0"
     },
     {
-      "name": "stahnma-epel",
-      "version_requirement": ">= 1.2.2 < 2.0.0"
+      "name": "puppet-epel",
+      "version_requirement": ">= 1.2.2 < 4.0.0"
     },
     {
       "name": "puppetlabs-python_task_helper",