Update katla and grisu for move to Bytemark

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 34c03de71563680c5ddfe6fb23ce3a05e4d4b174..0cdc647e1d4b16622b54a4f1dead9a868ccc763f 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -3,7 +3,24 @@ description "Master role applied to ironbelly"
 
 default_attributes(
   :apt => {
-    :sources => [ "ubuntugis-unstable" ]
+    :sources => ["ubuntugis-unstable"]
+  },
+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
+    }
   },
   :git => {
     :allowed_nodes => "*:*",
@@ -42,6 +59,21 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
+      },
+      :aws2ic => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
+      },
+      :ic2bm => {
+        :port => "1196",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1194"
+        }
       }
     }
   },
@@ -56,7 +88,7 @@ default_attributes(
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,
-        :hosts_allow => [ 
+        :hosts_allow => [
           "212.110.172.32",                      # shenron
           "2001:41c9:1:400::32",                 # shenron
           "212.159.112.221"                      # grant
@@ -84,7 +116,7 @@ default_attributes(
       }
     }
   }
-);
+)
 
 run_list(
   "role[ic]",
@@ -97,7 +129,10 @@ run_list(
   "role[stats]",
   "role[planet]",
   "role[planetdump]",
+  "role[logstash]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
-  "recipe[git::server]"
+  "recipe[git::server]",
+  "recipe[tilelog]",
+  "recipe[serverinfo]"
 )