Move logstash data to main storage array

diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index fa72b698da9182e8f5ae6ef33b148b177dcc564c..9acaaa16f6d4e004c97a1b5a17560f3f18c443d0 100644 (file)
--- 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 984fb1e85ac4d3c7e60cef2d130f4b37c67d28be..1df2ea50c9d5270c3da5730f4c6ff2e163d5678c 100644 (file)
--- 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 fb86c78f09e8d349428500cefda7860ac59d66c3..029c54b4038bceb153c536cbb68b0be52ba2ce54 100644 (file)
--- 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",