Merge remote-tracking branch 'github/pull/604'

[chef.git] / roles / gorwen.rb

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