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

[chef.git] / roles / muirdris.rb

diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index 38ef43f3a9100f39aeb460248fbafd2304ee11fc..81cb6395367c8b980852cb4645c1e2a895ab839d 100644 (file)
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -7,11 +7,12 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.15",
+        :inet => {
+          :address => "10.0.64.15"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -19,17 +20,15 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.111"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::f"
+        :inet => {
+          :address => "184.104.226.111"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::f"
+        }
       }
     }
   }