Drop last traces of old shorewall firewall zones

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 2c565f1e3d32d72d90ecad496c86a74377242b71..4e178bdec3f011b97f5d206311ae95351a773abf 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,36 +4,36 @@ description "Master role applied to spike-02"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.4",
+      :internal => {
+        :inet => {
+          :address => "10.0.64.4"
+        },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet,
-        :address => "184.104.226.100"
+      :henet => {
+        :inet => {
+          :address => "184.104.226.100"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::4"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::4"
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.100"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::4"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )