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

[chef.git] / roles / gorwen.rb

diff --git a/roles/gorwen.rb b/roles/gorwen.rb
index 18ca17ae73125e903f953dc512a92f9756c117b5..929ffbac0c713f2823ad26cb6022a0fbc6230935 100644 (file)
--- a/roles/gorwen.rb
+++ b/roles/gorwen.rb
@@ -2,55 +2,42 @@ name "gorwen"
 description "Master role applied to gorwen"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "20g"
+  :dhcpd => {
+    :first_address => "10.0.78.1",
+    :last_address => "10.0.78.254"
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "200.25.1.70",
-        :prefix => "28",
-        :gateway => "200.25.1.65"
+      :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 => "2800:1e0:a01:a006::6f",
-        :prefix => "125",
-        :gateway => "2800:1e0:a01:a006::69"
-      }
-    },
-    :wireguard => {
-      :enabled => false
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "16384 MB",
-    :cache_dir => [
-      "rock /store/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 => {
-        :max_size => "8192M"
+        :inet => {
+          :address => "184.104.226.108"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::c"
+        }
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "bogota.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[edgeuno-co]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-dl360e-g8]",
+  "role[community]",
+  "recipe[dhcpd]"
 )