tilecache: Remove USA peers from NZ caches

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index e0d03d2202aa5117e6ecb1567438d1038e7aa978..bbfd5853b04d598e78ffef05abfd54ce14b548b2 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -14,32 +14,22 @@ default_attributes(
         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {

-        :interface => "bond0.3",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :address => "130.117.76.7"
       },
         :role => :external,
         :family => :inet,
         :address => "130.117.76.7"
       },

-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1007"
-      # }
-    }
-  },
-  :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"
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:7"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[hp-dl360-g6]",
-  "role[web-frontend]"
+  "role[equinix]",
+  "role[hp-dl360-g6]"

 )
 )