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

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 05626dc5f5cb386a8e01b0e0146f30c1c113704b..52d51ad30b11a52ba59106b2558feb73a14fdecb 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,26 +4,42 @@ description "Master role applied to spike-02"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.7",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
+      },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.100",
-        :hwaddress => "00:1b:78:04:a5:5a"
+        :address => "130.117.76.7"
       },
       :external_ipv6 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:219:bbff:fe39:3d9e",
-        :hwaddress => "00:1b:78:04:a5:5a"
+        :address => "2001:978:2:2C::172:7"
+      }
+    }
+  },
+  :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-g6]",
+  "role[equinix]",
+  "role[hp-dl360-g6]",
   "role[web-frontend]"
 )