Remove web-frontend role from spike-{01,02,03}

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

diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index ba73876e0d1bdf6ae303fb318a91fa5e7956550a..3708e1961a63db43f3029ae4629b7200bff089ca 100644 (file)
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -5,32 +5,40 @@ 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.48.8",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.103",
-        :hwaddress => "00:19:bb:39:8a:ba"
+        :address => "130.117.76.8"
       },
       :external_ipv6 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:219:bbff:fe39:8aba",
-        :hwaddress => "00:19:bb:39:8a:ba"
+        :address => "2001:978:2:2C::172:8"
+      }
+    }
+  },
+  :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"
       }
     }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl360-g6]",
-  "role[web-frontend]"
+  "role[equinix]",
+  "role[hp-dl360-g6]"
 )