X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e947590c6a42789d8a1c240331d85ca637274ed4..13ef9975b5d6b159207273e971cf614477c793ca:/roles/jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 5fc22b2b0..1f92c87df 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -2,68 +2,42 @@ name "jakelong"
 description "Master role applied to jakelong"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "3g"
+  :dhcpd => {
+    :first_address => "10.0.78.1",
+    :last_address => "10.0.78.254"
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "71.19.155.177",
-        :prefix => "24",
-        :gateway => "71.19.155.1"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.12"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 ens1f0 ens1f1]
+        }
       },
-      :external_ipv6 => {
-        :interface => "eth0",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet6,
-        :address => "2605:2700:0:17:a800:ff:fe3e:cdca",
-        :prefix => "64",
-        :gateway => "2605:2700:0:17::1"
-      }
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "1024 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 3840 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 4800 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 6720 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 8640 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "2048M"
+        :inet => {
+          :address => "184.104.226.108"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::c"
+        }
       }
     }
-  },
-  :sysctl => {
-    :kvm => {
-      :comment => "Tuning for KVM guest",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    },
-    :network_conntrack_max => {
-      :comment => "Increase max number of connections tracked",
-      :parameters => {
-        "net.netfilter.nf_conntrack_max" => "65536"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "sanfrancisco.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[prgmr]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-dl360e-g8]",
+  "role[community]",
+  "recipe[dhcpd]"
 )