From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Sep 2015 23:31:00 +0000 (+0100)
Subject: Move logstash data to main storage array
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c2623e1ade43795e85f045d576495453b53f4a1f

Move logstash data to main storage array
---

diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index fa72b698d..9acaaa16f 100644
--- a/cookbooks/elasticsearch/attributes/default.rb
+++ b/cookbooks/elasticsearch/attributes/default.rb
@@ -1 +1,2 @@
 default[:elasticsearch][:script][:disable_dynamic] = true
+default[:elasticsearch][:path][:data] = "/var/lib/elasticsearch"
diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
index 984fb1e85..1df2ea50c 100644
--- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
+++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
@@ -2,4 +2,5 @@
 
 cluster.name: <%= node[:elasticsearch][:cluster][:name] %>
 network.host: 127.0.0.1
+path.data: <%= node[:elasticsearch][:path][:data] %>
 script.disable_dynamic: <%= node[:elasticsearch][:script][:disable_dynamic] -%>
diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index fb86c78f0..029c54b40 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,11 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
+  :elasticsearch => {
+    :path => {
+      :data => "/store/elasticsearch"
+    }
+  },
   :git => {
     :allowed_nodes => "*:*",
     :user => "chefrepo",