X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Felasticsearch%2Fmanifests%2Fparams.pp;h=8b137bb414affa3511a64ba8e193cfa2a6fee101;hb=b246ebbfa566fda9b4b46616688a45ea17053588;hp=3d1706f2a856871734976db11f5b0d13714aa709;hpb=8efe10c37b152ebbf7fd051ea13ddd2b06d43e77;p=dsa-puppet.git

diff --git a/3rdparty/modules/elasticsearch/manifests/params.pp b/3rdparty/modules/elasticsearch/manifests/params.pp
index 3d1706f2..8b137bb4 100644
--- a/3rdparty/modules/elasticsearch/manifests/params.pp
+++ b/3rdparty/modules/elasticsearch/manifests/params.pp
@@ -133,54 +133,34 @@ class elasticsearch::params {
   # service parameters
   case $::operatingsystem {
     'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux', 'SLC': {
-      $service_name       = 'elasticsearch'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $defaults_location  = '/etc/sysconfig'
-      $pid_dir            = '/var/run/elasticsearch'
 
-      if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
-        $init_template     = 'elasticsearch.systemd.erb'
-        $service_providers = 'systemd'
-      } else {
-        $init_template     = 'elasticsearch.RedHat.erb'
-        $service_providers = 'init'
+      case $::operatingsystemmajrelease {
+        '7': {
+          $init_template     = 'elasticsearch.systemd.erb'
+          $service_providers = 'systemd'
+        }
+        default: {
+          $init_template     = 'elasticsearch.RedHat.erb'
+          $service_providers = [ 'init' ]
+        }
       }
 
-    }
-    'Debian': {
       $service_name       = 'elasticsearch'
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name
-      $defaults_location  = '/etc/default'
-      if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
-        $init_template     = 'elasticsearch.systemd.erb'
-        $service_providers = 'systemd'
-        $pid_dir           = '/var/run/elasticsearch'
-      } else {
-        $init_template     = 'elasticsearch.Debian.erb'
-        $service_providers = [ 'init' ]
-        $pid_dir           = false
-      }
+      $defaults_location  = '/etc/sysconfig'
+      $pid_dir            = '/var/run/elasticsearch'
     }
-    'Ubuntu': {
+    'Debian', 'Ubuntu': {
       $service_name       = 'elasticsearch'
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name
+      $service_providers  = 'init'
       $defaults_location  = '/etc/default'
-
-      if versioncmp($::operatingsystemmajrelease, '15') >= 0 {
-        $init_template     = 'elasticsearch.systemd.erb'
-        $service_providers = 'systemd'
-        $pid_dir           = '/var/run/elasticsearch'
-      } else {
-        $init_template     = 'elasticsearch.Debian.erb'
-        $service_providers = [ 'init' ]
-        $pid_dir           = false
-      }
+      $init_template      = 'elasticsearch.Debian.erb'
+      $pid_dir            = false
     }
     'Darwin': {
       $service_name       = 'FIXME/TODO'