X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/43ac33e14359233612376a19c7f47903228d6639..a94a26869b4b2a23b32266db58612795b1d3d3d8:/roles/ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 85ba5e60d..13f965226 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,9 +5,21 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
     }
   },
   :git => {
@@ -47,6 +59,13 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
+      },
+      :aws2ic => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
       }
     }
   },
@@ -102,8 +121,10 @@ run_list(
   "role[stats]",
   "role[planet]",
   "role[planetdump]",
+  "role[logstash]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",
-  "recipe[tilelog]"
+  "recipe[tilelog]",
+  "recipe[serverinfo]"
 )