Merge pull request #762 from jfroche/add-plugin-install-options

Install package with options in sensors and disk plugins
voxpupuli · Mar 27, 2018 · 3ecef72 · 3ecef72
2 parents 87dcba5 + a89c47d
commit 3ecef72
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/manifests/plugin/disk.pp b/manifests/plugin/disk.pp
@@ -7,6 +7,7 @@
   $manage_package         = undef,
   $package_name           = 'collectd-disk',
   $udevnameattr           = undef,
+  Optional[Array[String]] $package_install_options = undef
 ) {
 
   include ::collectd
@@ -30,8 +31,9 @@
 
     if $_manage_package {
       package { 'collectd-disk':
-        ensure => $ensure_real,
-        name   => $package_name,
+        ensure          => $ensure_real,
+        name            => $package_name,
+        install_options => $package_install_options,
       }
     }
   }

diff --git a/manifests/plugin/sensors.pp b/manifests/plugin/sensors.pp
@@ -6,6 +6,7 @@
   $sensors          = undef,
   $ignoreselected   = undef,
   $interval         = undef,
+  Optional[Array[String]] $package_install_options = undef
 ) {
 
   include ::collectd
@@ -15,7 +16,8 @@
   if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-sensors':
-        ensure => $ensure,
+        ensure          => $ensure,
+        install_options => $package_install_options,
       }
     }
   }

diff --git a/spec/classes/collectd_plugin_disk_spec.rb b/spec/classes/collectd_plugin_disk_spec.rb
@@ -136,6 +136,20 @@
             )
           end
         end
+        context ':install_options install package with install options' do
+          let :params do
+            {
+              package_install_options: ['--enablerepo=mycollectd-repo']
+            }
+          end
+
+          it 'Will install the package with install options' do
+            is_expected.to contain_package('collectd-disk').with(
+              ensure: 'present',
+              install_options: ['--enablerepo=mycollectd-repo']
+            )
+          end
+        end
       end
     end
   end

diff --git a/spec/classes/collectd_plugin_sensors.rb b/spec/classes/collectd_plugin_sensors.rb
@@ -105,4 +105,26 @@
                                                        path: '/etc/collectd.d/10-sensors.conf')
     end
   end
+
+  context ':install_options install package with install options' do
+    let :facts do
+      {
+        osfamily: 'RedHat',
+        collectd_version: '5.4',
+        operatingsystemmajrelease: '7',
+        python_dir: '/usr/local/lib/python2.7/dist-packages'
+      }
+    end
+    let :params do
+      { ensure: 'present',
+        install_options: ['--enablerepo=mycollectd-repo'] }
+    end
+
+    it 'Will install the package with install options' do
+      is_expected.to contain_package('collectd-sensors').with(
+        ensure: 'present',
+        install_options: ['--enablerepo=mycollectd-repo']
+      )
+    end
+  end
 end