Merge pull request voxpupuli#36 from brucem/hotfix/allow_multiple_tem…

…plates

Allow multiple templates

manifests/config.pp

@@ -50,4 +50,10 @@
     notify  => $notify_elasticsearch,
   }
 
+  exec { 'mkdir_templates':
+    command => "mkdir -p ${elasticsearch::confdir}/templates_import",
+    cwd     => '/',
+    creates => "${elasticsearch::confdir}/templates_import",
+  }
+
 }

manifests/template.pp

@@ -67,20 +67,14 @@
     }
   }
 
-  exec { 'mkdir_templates':
-    command => "mkdir -p ${elasticsearch::confdir}/templates_import",
-    cwd     => '/',
-    creates => "${elasticsearch::confdir}/templates_import",
-  }
-
   $file_ensure = $delete ? {
     true  => 'absent',
     false => 'present'
   }
 
   $file_notify = $delete ? {
     true  => undef,
-    false => Exec[ 'insert_template' ]
+    false => Exec[ "insert_template ${name}" ]
   }
 
   # place the template file
@@ -95,13 +89,13 @@
 
     # Only notify the insert_template call when we do a replace.
     $exec_notify = $replace ? {
-      true  => Exec[ 'insert_template' ],
+      true  => Exec[ "insert_template ${name}" ],
       false => undef
     }
 
     # Delete the existing template
     # First check if it exists of course
-    exec { 'delete_template':
+    exec { "delete_template ${name}":
       command => "curl -s -XDELETE ${es_url}",
       onlyif  => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
       notify  => $exec_notify
@@ -112,7 +106,7 @@
   # Insert the template if we don't delete an existing one
   # Before inserting we check if a template exists with that same name
   if $delete == false {
-    exec { 'insert_template':
+    exec { "insert_template ${name}":
       command     => "curl -s -XPUT ${es_url} -d @${elasticsearch::confdir}/templates_import/elasticsearch-template-${name}.json",
       unless      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
       refreshonly => true,

spec/defines/template_spec.rb

@@ -13,7 +13,7 @@
     } end
 
     it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should contain_exec('insert_template').with(:command => 'curl -s -XPUT http://localhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
+    it { should contain_exec('insert_template foo').with(:command => 'curl -s -XPUT http://localhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
   end
 
   context "Delete a template" do
@@ -23,8 +23,8 @@
     } end
 
     it { should_not contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should_not contain_exec('insert_template') }
-    it { should contain_exec('delete_template').with(:command => 'curl -s -XDELETE http://localhost:9200/_template/foo', :notify => nil, :onlyif => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1' ) }
+    it { should_not contain_exec('insert_template foo') }
+    it { should contain_exec('delete_template foo').with(:command => 'curl -s -XDELETE http://localhost:9200/_template/foo', :notify => nil, :onlyif => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1' ) }
   end
 
   context "Replace a template" do
@@ -35,8 +35,8 @@
     } end
 
     it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should contain_exec('insert_template').with(:command => 'curl -s -XPUT http://localhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
-    it { should contain_exec('delete_template').with(:command => 'curl -s -XDELETE http://localhost:9200/_template/foo', :notify => 'Exec[insert_template]', :onlyif => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1' ) }
+    it { should contain_exec('insert_template foo').with(:command => 'curl -s -XPUT http://localhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
+    it { should contain_exec('delete_template foo').with(:command => 'curl -s -XDELETE http://localhost:9200/_template/foo', :notify => 'Exec[insert_template foo]', :onlyif => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1' ) }
 
   end
 
@@ -60,7 +60,7 @@
     } end
 
     it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should contain_exec('insert_template').with(:command => 'curl -s -XPUT http://otherhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://otherhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
+    it { should contain_exec('insert_template foo').with(:command => 'curl -s -XPUT http://otherhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://otherhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
   end
 
 end