mediawiki: Remove xbl.spamhaus.org DNSBL

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

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 14f5b3e500d2fd7675b9496c97ae6c7786ebf91e..5f048e341a6c26209fc534cea19a5a1aa6e3328e 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -4,11 +4,12 @@ description "Master role applied to spike-01"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.3",
+        :inet => {
+          :address => "10.0.64.3"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,17 +17,15 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.99"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::3"
+        :inet => {
+          :address => "184.104.226.99"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::3"
+        }
       }
     }
   }