Debian service name is slightly different

jhoblitt · Jun 30, 2016 · 352ba6d · 352ba6d
1 parent 7a19bd4
commit 352ba6d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -33,8 +33,9 @@
   include ::ipmi::config
 
   class { 'ipmi::service::ipmi':
-    ensure => $service_ensure,
-    enable => $enable_ipmi,
+    ensure       => $service_ensure,
+    enable       => $enable_ipmi,
+    ipmi_service_name => $ipmi::params::ipmi_service_name,
   }
 
   class { 'ipmi::service::ipmievd':

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -9,10 +9,12 @@
         '5': {
           $ipmi_package = ['OpenIPMI', 'OpenIPMI-tools']
           $config_location = '/etc/sysconfig/ipmi'
+          $ipmi_service_name = 'ipmi'
         }
         '6', '7': {
           $ipmi_package = ['OpenIPMI', 'ipmitool']
           $config_location = '/etc/sysconfig/ipmi'
+          $ipmi_service_name = 'ipmi'
         }
         default: {
           fail("Module ${module_name} is not supported on operatingsystemmajrelease ${::operatingsystemmajrelease}")
@@ -24,10 +26,12 @@
         'ubuntu': {
           $ipmi_package    = ['openipmi', 'ipmitool']
           $config_location = '/etc/default/openipmi'
+          $ipmi_service_name = 'openipmi'
         }
         'debian': {
           $ipmi_package    = ['openipmi', 'ipmitool']
           $config_location = '/etc/default/openipmi'
+          $ipmi_service_name = 'openipmi'
         }
         default: {
           fail("Module ${module_name} is not supported on operatingsystem ${::operatingsystem}")

diff --git a/manifests/service/ipmi.pp b/manifests/service/ipmi.pp
@@ -5,11 +5,12 @@
 class ipmi::service::ipmi (
   $ensure = 'running',
   $enable = true,
+  $ipmi_service_name = 'ipmi',
 ) {
   validate_re($ensure, '^running$|^stopped$')
   validate_bool($enable)
 
-  service{ 'ipmi':
+  service{ $ipmi_service_name:
     ensure     => $ensure,
     hasstatus  => true,
     hasrestart => true,

diff --git a/spec/classes/ipmi_spec.rb b/spec/classes/ipmi_spec.rb
@@ -28,6 +28,10 @@
           :ensure => 'running',
           :enable => true,
         })
+        should contain_service('ipmi').with({
+          :ensure => 'running',
+          :enable => true,
+        })
       end
       it do
         should contain_class('ipmi::service::ipmievd').with({
@@ -267,6 +271,10 @@
           :ensure => 'running',
           :enable => true,
         })
+        should contain_service('openipmi').with({
+          :ensure => 'running',
+          :enable => true,
+        })
       end
       it do
         should contain_class('ipmi::service::ipmievd').with({