Only reserve one CPU for other tasks on render servers

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 988d636eb7fd9c6f68f99d1fed04286300499870..5042c4dd0547547d9d01e28a8abbab4fc2afc662 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,13 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
+  :bind => {
+    :clients => "equinix"
+  },
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :elasticsearch => {
     :cluster => {
       :routing => {
@@ -12,7 +19,8 @@ default_attributes(
           :disk => {
             :watermark => {
               :low => "95%",
-              :high => "98%"
+              :high => "98%",
+              :flood_stage => "99%"
             }
           }
         }
@@ -28,54 +36,27 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.48.2",
+        :address => "10.0.48.10",
         :bond => {
           :slaves => %w[eth0 eth1]
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "130.117.76.2"
-      },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1002"
-      # }
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      },
-      :aws2ic => {
-        :port => "1195",
-        :mode => "server",
-        :peer => {
-          :host => "fafnir.openstreetmap.org"
-        }
+        :address => "130.117.76.10"
       },
-      :ic2bm => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "grisu.openstreetmap.org",
-          :port => "1194"
-        }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:A"
       }
     }
   },
   :planet => {
-    :replication => "disabled"
+    :replication => "enabled"
   },
   :rsyncd => {
     :modules => {
@@ -121,16 +102,14 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
-  "role[stats]",
   "role[planet]",
-  # "role[planetdump]",
-  "role[logstash]",
+  "role[planetdump]",
   "recipe[rsyncd]",
-  "recipe[openvpn]",
+  "recipe[dhcpd]",
   "recipe[tilelog]"
 )