X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Felasticsearch%2Fmanifests%2Fplugin.pp;h=f0166a371801666ceaf439465e106a969e997c90;hb=b246ebbfa566fda9b4b46616688a45ea17053588;hp=9cd04484e874abfe29c69c5230f408aa9c5417ae;hpb=8efe10c37b152ebbf7fd051ea13ddd2b06d43e77;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/elasticsearch/manifests/plugin.pp b/3rdparty/modules/elasticsearch/manifests/plugin.pp
index 9cd04484e..f0166a371 100644
--- a/3rdparty/modules/elasticsearch/manifests/plugin.pp
+++ b/3rdparty/modules/elasticsearch/manifests/plugin.pp
@@ -77,7 +77,6 @@ define elasticsearch::plugin(
     user      => $elasticsearch::elasticsearch_user,
     tries     => 6,
     try_sleep => 10,
-    timeout   => 600,
   }
 
   $notify_service = $elasticsearch::restart_on_change ? {
@@ -108,12 +107,6 @@ define elasticsearch::plugin(
 
   case $ensure {
     'installed', 'present': {
-      $name_file_path = "${elasticsearch::plugindir}/${module_dir}/.name"
-      exec {"purge_plugin_${module_dir}_old":
-        command => "${elasticsearch::plugintool} --remove ${module_dir}",
-        onlyif  => "test -e ${elasticsearch::plugindir}/${module_dir} && test \"$(cat ${name_file_path})\" != '${name}'",
-        before  => Exec["install_plugin_${name}"],
-      }
       exec {"install_plugin_${name}":
         command => $install_cmd,
         creates => "${elasticsearch::plugindir}/${module_dir}",
@@ -121,11 +114,6 @@ define elasticsearch::plugin(
         notify  => $notify_service,
         require => File[$elasticsearch::plugindir],
       }
-      file {$name_file_path:
-        ensure  => file,
-        content => $name,
-        require => Exec["install_plugin_${name}"],
-      }
     }
     default: {
       exec {"remove_plugin_${name}":