Update network interface name for longma

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index d257540034594ab71af21c8b24d56248fc241da8..8bc758e762fa42769919200490bf3b6f8ff7d288 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,10 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :elasticsearch => {
     :cluster => {
       :routing => {
@@ -12,7 +16,8 @@ default_attributes(
           :disk => {
             :watermark => {
               :low => "95%",
-              :high => "98%"
+              :high => "98%",
+              :flood_stage => "99%"
             }
           }
         }
@@ -28,23 +33,23 @@ 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"
+        :address => "130.117.76.10"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1002"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:A"
+      }
     }
   },
   :openvpn => {
@@ -75,7 +80,7 @@ default_attributes(
     }
   },
   :planet => {
-    :replication => "disabled"
+    :replication => "enabled"
   },
   :rsyncd => {
     :modules => {
@@ -104,15 +109,15 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "193.60.236.0/24",      # ucl 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
+          "193.60.236.0/24",          # ucl external
+          "10.0.48.0/20",             # equinix internal
+          "130.117.76.0/27",          # equinix external
+          "2001:978:2:2C::172:0/112", # equinix 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
         ],
         :nodes_allow => "roles:tilecache"
       }
@@ -121,16 +126,16 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
-  "role[stats]",
   "role[planet]",
-  # "role[planetdump]",
+  "role[planetdump]",
   "role[logstash]",
   "recipe[rsyncd]",
+  "recipe[dhcpd]",
   "recipe[openvpn]",
   "recipe[tilelog]"
 )