X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3447bb8c50e33a34e171dc9f071f3a212cc3da47..5a4919337b3d34a106cbc4b1ce6bf5c84a1dae44:/roles/longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index 8ae01b958..d0c79ee50 100644
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -2,57 +2,36 @@ name "longma"
 description "Master role applied to longma"
 
 default_attributes(
-  :exim => {
-    :aliases => {
-      :root => "ceasar"
-    }
-  },
-  :hardware => {
-    :shm_size => "20g"
-  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.13",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[]
+        }
+      },
       :external_ipv4 => {
-        :interface => "ens160",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
-        :address => "140.110.240.7",
-        :prefix => "24",
-        :gateway => "140.110.240.254"
+        :address => "184.104.226.109"
       },
       :external_ipv6 => {
-        :interface => "ens160",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
-        :address => "2001:e10:2000:240::7",
-        :prefix => "64",
-        :gateway => "2001:e10:2000:240::254"
-      }
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "16384 MB",
-    :cache_dir => [
-      "rock /store.new-san/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :directory => "/store.new-san/nginx-cache/proxy-cache"
+        :address => "2001:470:1:b3b::d"
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "hsinchu.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[nchc]",
-  "role[tilecache]"
+  "role[equinix-dub]"
 )