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 5a0e536bc7369ced5dfc0c5bcef7acb2ced7be7f..b5d84e6a61378c234a07e9c27d2528396acf42bc 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -4,33 +4,36 @@ description "Master role applied to spike-06"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.11",
+      :internal => {
+        :inet => {
+          :address => "10.0.48.6"
+        },
         :bond => {
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet,
-        :address => "130.117.76.11"
+      :henet => {
+        :inet => {
+          :address => "184.104.179.134"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::6"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:B"
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.102"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::6"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",