Update chef client to 12.10.24

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 4bcb8fb268bf6b9c4ea79b6e5849402932d22c2c..4eb5fbc45c39752557ff368f926bfce68e4a4747 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,23 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },

+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
+    }
+  },

   :git => {
     :allowed_nodes => "*:*",
     :user => "chefrepo",
   :git => {
     :allowed_nodes => "*:*",
     :user => "chefrepo",


@@ -42,9 +59,27 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
         :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"
+        }

       }
     }
   },
       }
     }
   },

+  :planet => {
+    :replication => "enabled"
+  },

   :rsyncd => {
     :modules => {
       :hosts => {
   :rsyncd => {
     :modules => {
       :hosts => {


@@ -77,6 +112,9 @@ default_attributes(
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external

+          "10.0.32.0/20",         # bytemark internal
+          "89.16.162.16/28",      # bytemark external
+          "2001:41c9:2:d6::/64",  # bytemark external

           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ],
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ],


@@ -97,8 +135,10 @@ run_list(
   "role[stats]",
   "role[planet]",
   "role[planetdump]",
   "role[stats]",
   "role[planet]",
   "role[planetdump]",

+  "role[logstash]",

   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",

-  "recipe[tilelog]"
+  "recipe[tilelog]",
+  "recipe[serverinfo]"

 )
 )