Merge interface families

[chef.git] / roles / faffy.rb

diff --git a/roles/faffy.rb b/roles/faffy.rb
index c7b8170d2b5ffd4212caee79cd66196feb511e6f..9f0a83552e4d18ff1de472414a7730222a310e4f 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -4,11 +4,12 @@ description "Master role applied to faffy"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.3",
+        :inet => {
+          :address => "10.0.48.3"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,17 +17,15 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.3"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:3"
+        :inet => {
+          :address => "130.117.76.3"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:3"
+        }
       }
     }
   }