Drop last traces of old shorewall firewall zones

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

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index b9b414190bcec952dcbc35ebd64dafef972af928..b5d84e6a61378c234a07e9c27d2528396acf42bc 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -5,50 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {

-        :interface => "bond0",
-        :role => :internal,

         :inet => {
         :inet => {

-          :address => "10.0.48.11"
+          :address => "10.0.48.6"

         },
         :bond => {
         },
         :bond => {

-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",

           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {

         :inet => {
         :inet => {

-          :address => "130.117.76.11",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
+          :address => "184.104.179.134"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:978:2:2c::172:b",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :address => "2001:470:1:fa1::6"

         }
       },
         }
       },

-      :external => {
-        :interface => "bond0.3",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {

         :inet => {
         :inet => {

-          :address => "184.104.179.139",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "82.199.86.102"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::b",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:4d78:500:5e3::6"

         }
       }
     }
         }
       }
     }


@@ -56,7 +33,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",
   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",