Redirect forum.osm.org to forum.openstreetmap.org for https connections

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 368eaf366b351d32ca4117ef9921129d44f277f8..bbfd5853b04d598e78ffef05abfd54ce14b548b2 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -5,38 +5,31 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.163",
-        :hwaddress => "00:1b:78:04:76:c0"
+        :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" }
-    }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl360-g6]",
-  "role[web-frontend]"
+  "role[equinix]",
+  "role[hp-dl360-g6]"
 )