don't override service init mechanism #53

deric · Feb 18, 2016 · b21468f · b21468f
1 parent 8d95e45
commit b21468f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -48,7 +48,7 @@
   $tracefile_threshold     = 'TRACE',
   $max_allowed_connections = undef,
   $peer_type               = 'UNSET',
-  $start_with              = 'init.d',
+  $start_with              = undef,
   $ensure_cron             = true,
   $service_package         = undef,
   $service_name            = $::zookeeper::params::service_name,
@@ -130,6 +130,7 @@
       cfg_dir        => $cfg_dir,
       zoo_dir        => $zoo_dir,
       log_dir        => $log_dir,
+      start_with     => $start_with,
       service_name   => $service_name,
       require        => Class['zookeeper::config'],
       before         => Anchor['zookeeper::end'],

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -13,11 +13,18 @@
       }
     }
     'Redhat': {
+      case $::operatingsystemmajrelease {
+        '6': { $initstyle = 'upstart' }
+        '7': { $initstyle = 'systemd' }
+        default: { $initstyle = undef }
+      }
       $_os_overrides = {
         'packages'     => ['zookeeper', 'zookeeper-server'],
         'service_name' => 'zookeeper-server',
+        'start_with'   => $initstyle,
       }
     }
+
     default: {
       $_os_overrides = {}
     }

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -3,6 +3,7 @@
 class zookeeper::service(
   $zoo_dir,
   $log_dir,
+  $start_with     = undef,    # init mechanism
   $cfg_dir        = '/etc/zookeeper/conf',
   $service_name   = 'zookeeper',
   $service_ensure = 'running',
@@ -12,18 +13,7 @@
 ){
   require zookeeper::install
 
-  case $::osfamily {
-    'redhat': {
-      case $::operatingsystemmajrelease {
-        '6': { $initstyle = 'upstart' }
-        '7': { $initstyle = 'systemd' }
-        default: { $initstyle = 'unknown' }
-      }
-    }
-    default: { $initstyle = 'unknown' }
-  }
-
-  if ($initstyle == 'systemd' and $manage_systemd == true) {
+  if ($start_with == 'systemd' and $manage_systemd == true) {
     file { '/usr/lib/systemd/system/zookeeper.service':
       ensure  => 'present',
       content => template('zookeeper/zookeeper.service.erb'),

diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
@@ -32,6 +32,12 @@
     let(:user) { 'zookeeper' }
     let(:group) { 'zookeeper' }
 
+    let(:params){{
+      :zoo_dir    => '/usr/lib/zookeeper',
+      :log_dir    => '/var/log/zookeeper',
+      :start_with => 'systemd',
+    }}
+
     it { should contain_package('zookeeper') }
 
     it { should contain_file(