Don't reject on an error from zen.spamhaus.org

[chef.git] / roles / spike-03.rb

diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index ee85b29d34727d17efa1e1c7032c53c1331557a8..c9bd546913bcdb5f90880c6024d9f0388e860184 100644 (file)
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -5,41 +5,35 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.171",
-        :hwaddress => "00:19:bb:39:8a:bc"
+        :address => "10.0.64.5",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.103",
-        :hwaddress => "00:19:bb:39:8a:ba"
+        :address => "184.104.226.101"
       },
       :external_ipv6 => {
-        :interface => "eth1",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:219:bbff:fe39:8aba",
-        :hwaddress => "00:19:bb:39:8a:ba"
-      }
-    }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.eth0.autoconf" => "0",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
+        :address => "2001:470:1:b3b::5"
       }
     }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl360-g6]",
+  "role[equinix-dub]",
+  "role[hp-g9]",
   "role[web-frontend]"
 )