]> git.openstreetmap.org Git - chef.git/blobdiff - roles/ironbelly.rb
Include WB items in regular search results by dflt
[chef.git] / roles / ironbelly.rb
index 4eb5fbc45c39752557ff368f926bfce68e4a4747..046262d4345f15839fc92ee79261582793e03f0b 100644 (file)
@@ -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 => {
@@ -22,31 +26,28 @@ default_attributes(
       :data => "/store/elasticsearch"
     }
   },
-  :git => {
-    :allowed_nodes => "*:*",
-    :user => "chefrepo",
-    :group => "chefrepo",
-    :backup => "chef-git"
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.177"
+        :address => "10.0.48.10",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.107"
+        :address => "130.117.76.10"
       },
       :external_ipv6 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:225:90ff:fec4:f6ef"
+        :address => "2001:978:2:2C::172:A"
       }
     }
   },
@@ -107,16 +108,15 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external (wates)
-          "128.40.45.192/27",     # ucl external (wolfson)
-          "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"
       }
@@ -125,10 +125,8 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[gateway]",
-  "role[chef-server]",
-  "role[chef-repository]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
@@ -137,8 +135,7 @@ run_list(
   "role[planetdump]",
   "role[logstash]",
   "recipe[rsyncd]",
+  "recipe[dhcpd]",
   "recipe[openvpn]",
-  "recipe[git::server]",
-  "recipe[tilelog]",
-  "recipe[serverinfo]"
+  "recipe[tilelog]"
 )