Revert "upgrade to elasticsearch/elasticsearch 0.9.6"

[dsa-puppet.git] / 3rdparty / modules / elasticsearch / manifests / service / systemd.pp

diff --git a/3rdparty/modules/elasticsearch/manifests/service/systemd.pp b/3rdparty/modules/elasticsearch/manifests/service/systemd.pp
index fb7912fbf36373dcb359298cbc0455fb327103d4..dee54e5973c363b9f8ec301c16934f0c5142f6e7 100644 (file)
--- a/3rdparty/modules/elasticsearch/manifests/service/systemd.pp
+++ b/3rdparty/modules/elasticsearch/manifests/service/systemd.pp
@@ -122,15 +122,14 @@ define elasticsearch::service::systemd(
         notify => $notify_service,
       }
 
-    } else {
-      if ($init_defaults != undef and is_hash($init_defaults) ) {
+    } elsif ($init_defaults != undef and is_hash($init_defaults) ) {
 
-        if(has_key($init_defaults, 'ES_USER')) {
-          if($init_defaults['ES_USER'] != $elasticsearch::elasticsearch_user) {
-            fail('Found ES_USER setting for init_defaults but is not same as elasticsearch_user setting. Please use elasticsearch_user setting.')
-          }
+      if(has_key($init_defaults, 'ES_USER')) {
+        if($init_defaults['ES_USER'] != $elasticsearch::elasticsearch_user) {
+          fail('Found ES_USER setting for init_defaults but is not same as elasticsearch_user setting. Please use elasticsearch_user setting.')
         }
       }
+
       $init_defaults_pre_hash = { 'ES_USER' => $elasticsearch::elasticsearch_user, 'ES_GROUP' => $elasticsearch::elasticsearch_group, 'MAX_OPEN_FILES' => '65535' }
       $new_init_defaults = merge($init_defaults_pre_hash, $init_defaults)
 
@@ -141,29 +140,16 @@ define elasticsearch::service::systemd(
         before  => Service["elasticsearch-instance-${name}"],
         notify  => $notify_service,
       }
+
     }
 
     # init file from template
     if ($init_template != undef) {
 
-      $user              = $elasticsearch::elasticsearch_user
-      $group             = $elasticsearch::elasticsearch_group
-      $pid_dir           = $elasticsearch::pid_dir
-      $defaults_location = $elasticsearch::defaults_location
-
-      if ($new_init_defaults != undef and is_hash($new_init_defaults) and has_key($new_init_defaults, 'MAX_OPEN_FILES')) {
-        $nofile = $new_init_defaults['MAX_OPEN_FILES']
-      }else{
-        $nofile = '65535'
-      }
-
-      if ($new_init_defaults != undef and is_hash($new_init_defaults) and has_key($new_init_defaults, 'MAX_LOCKED_MEMORY')) {
-        $memlock = $new_init_defaults['MAX_LOCKED_MEMORY']
-      }else{
-        $memlock = undef
-      }
+      $user  = $elasticsearch::elasticsearch_user
+      $group = $elasticsearch::elasticsearch_group
 
-      file { "/lib/systemd/system/elasticsearch-${name}.service":
+      file { "/usr/lib/systemd/system/elasticsearch-${name}.service":
         ensure  => $ensure,
         content => template($init_template),
         before  => Service["elasticsearch-instance-${name}"],
@@ -176,7 +162,7 @@ define elasticsearch::service::systemd(
 
   } elsif($status != 'unmanaged') {
 
-    file { "/lib/systemd/system/elasticsearch-${name}.service":
+    file { "/usr/lib/systemd/system/elasticsearch-${name}.service":
       ensure    => 'absent',
       subscribe => Service["elasticsearch-instance-${name}"],
       notify    => Exec["systemd_reload_${name}"],