X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6782e9d4eeaf925882a000a7423afa0633948213..0f8936ab11fc6fbbc973c5b866a5cca0397a13e2:/roles/jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 1c3a3a415..b346657e5 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -2,62 +2,42 @@ name "jakelong"
 description "Master role applied to jakelong"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.78.1",
+    :last_address => "10.0.78.254"
+  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.12",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 ens1f0 ens1f1]
+        }
+      },
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
-        :address => "64.62.205.202",
-        :prefix => "26",
-        :gateway => "64.62.205.193"
+        :address => "184.104.226.108"
       },
       :external_ipv6 => {
-        :interface => "eth0",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
-        :address => "2001:470:1:41:a800:ff:fe3e:cdca",
-        :prefix => "64",
-        :gateway => "fe80::260:ddff:fe46:623d"
+        :address => "2001:470:1:b3b::c"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "700 MB",
-    :cache_dir => "coss /store/squid/coss-01 10000 block-size=8192 max-size=262144 membufs=30"
-  },
-  :sysctl => {
-    :kvm => {
-      :comment => "Tuning for KVM guest",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    }
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/xvda/queue/scheduler" => "deadline"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "sanfrancisco.render.openstreetmap.org",
-    :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
-      "stormfly-02.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[prgmr]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-dl360e-g8]",
+  "recipe[dhcpd]"
 )