X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Felasticsearch%2Fmanifests%2Ftemplate.pp;h=bb529a2a14cefc4b05c3c62529a43793a6c2de0e;hb=8d6317345a753cb58144a5744829790abe2804cf;hp=ade236c243d387f3a0e2a2cfa2726b90544b7ef1;hpb=47e66c55978a019774cdbfa777be7bbcec325863;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/elasticsearch/manifests/template.pp b/3rdparty/modules/elasticsearch/manifests/template.pp
index ade236c24..bb529a2a1 100644
--- a/3rdparty/modules/elasticsearch/manifests/template.pp
+++ b/3rdparty/modules/elasticsearch/manifests/template.pp
@@ -69,7 +69,7 @@ define elasticsearch::template(
     path      => [ '/bin', '/usr/bin', '/usr/local/bin' ],
     cwd       => '/',
     tries     => 6,
-    try_sleep => 10
+    try_sleep => 10,
   }
 
   # Build up the url
@@ -100,7 +100,7 @@ define elasticsearch::template(
     command     => "curl -s -XDELETE ${es_url}",
     onlyif      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
     notify      => $insert_notify,
-    refreshonly => true
+    refreshonly => true,
   }
 
   if ($ensure == 'absent') {
@@ -118,7 +118,7 @@ define elasticsearch::template(
     if $content == undef {
       # place the template file using the file source
       file { "${elasticsearch::configdir}/templates_import/elasticsearch-template-${name}.json":
-        ensure  => 'present',
+        ensure  => file,
         source  => $file,
         notify  => Exec[ "delete_template_${name}" ],
         require => Exec[ 'mkdir_templates_elasticsearch' ],
@@ -126,7 +126,7 @@ define elasticsearch::template(
     } else {
       # place the template file using content
       file { "${elasticsearch::configdir}/templates_import/elasticsearch-template-${name}.json":
-        ensure  => 'present',
+        ensure  => file,
         content => $content,
         notify  => Exec[ "delete_template_${name}" ],
         require => Exec[ 'mkdir_templates_elasticsearch' ],
@@ -137,7 +137,7 @@ define elasticsearch::template(
       command     => "curl -sL -w \"%{http_code}\\n\" -XPUT ${es_url} -d @${elasticsearch::configdir}/templates_import/elasticsearch-template-${name}.json -o /dev/null | egrep \"(200|201)\" > /dev/null",
       unless      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
       refreshonly => true,
-      loglevel    => 'debug'
+      loglevel    => 'debug',
     }
 
   }