Merge remote-tracking branch 'github/pull/558'

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 4eff9e02a8a3184ddb18a7841b36d87fac0c2914..e2e54bd450fb2b9baeace8ca020264fcc6f560f4 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -2,65 +2,43 @@ name "jakelong"
 description "Master role applied to jakelong"
 
 default_attributes(
 description "Master role applied to jakelong"
 
 default_attributes(

+  :dhcpd => {
+    :first_address => "10.0.78.1",
+    :last_address => "10.0.78.254"
+  },

   :networking => {
     :interfaces => {
   :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 => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0.101",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "71.19.155.177",
-        :prefix => "24",
-        :gateway => "71.19.155.1"
+        :address => "184.104.226.108"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "bond0.101",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2605:2700:0:17:a800:ff:fe3e:cdca",
-        :prefix => "64",
-        :gateway => "2605:2700:0:17::1"
-      }
-    }
-  },
-  :squid => {
-    :cache_mem => "1024 MB",
-    :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30"
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "2048M"
-      }
-    }
-  },
-  :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"
+        :address => "2001:470:1:b3b::c"

       }
     }
       }
     }

-  },
-  :tilecache => {
-    :tile_parent => "sanfrancisco.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "ascalon.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[prgmr]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-dl360e-g8]",
+  "role[community]",
+  "recipe[dhcpd]"

 )
 )