Merge pull request #18 from Wellspring-Worldwide/rk-20160425-better-r…

…edhat-support Redhat systems need to use 'redhat', not 'init'
meltwater · May 23, 2016 · 7bf9fec · 7bf9fec
2 parents 9b12f25 + dc8f535
commit 7bf9fec
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -112,6 +112,18 @@
           notify  => Service['marathon']
         }
       }
+      'redhat' : {
+        file { 'marathon-conf':
+          ensure  => file,
+          path    => '/etc/init.d/marathon',
+          owner   => $real_user,
+          group   => $real_group,
+          mode    => '0755',
+          content => template('marathon/marathon.sysv.erb'),
+          before  => Service['marathon'],
+          notify  => Service['marathon']
+        }
+      }
       default : {
         fail("I don't know how to create an init script \
           for style ${marathon::init_style}")

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -16,7 +16,7 @@
       default => undef
     },
     /CentOS|RedHat|OracleLinux/      => $::operatingsystemmajrelease ? {
-      /(4|5|6)/ => 'sysv',
+      /(4|5|6)/ => 'redhat',
       default   => 'systemd',
     },
     'Fedora'             => $::operatingsystemmajrelease ? {

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -29,6 +29,10 @@
           :ensure => 'file',
           :path   => '/etc/init.d/marathon'
           }) }
+
+        it { should contain_service('marathon').with({
+          :provider => 'redhat'
+          }) }
       end
 
       if operatingsystem == 'Fedora'