Drop no longer supported switches from cgimap

[chef.git] / roles / albi.rb

diff --git a/roles/albi.rb b/roles/albi.rb
index ea0a2a9194abab926ab9c071b23d1e6372972478..8608554e56ecfeaad718f354f561f55a9325aec7 100644 (file)
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -4,21 +4,19 @@ description "Master role applied to albi"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "enp1s0f0",
         :role => :external,
         :interface => "enp1s0f0",
         :role => :external,

-        :family => :inet,
-        :address => "51.159.53.238",
-        :prefix => "24",
-        :gateway => "51.159.53.1"
-      },
-      :external_ipv6 => {
-        :interface => "enp1s0f0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:bc8:1200:4:dac4:97ff:fe8a:9cfc",
-        :prefix => "64",
-        :gateway => "fe80::a293:51ff:fea2:ded5"
+        :inet => {
+          :address => "51.159.53.238",
+          :prefix => "24",
+          :gateway => "51.159.53.1"
+        },
+        :inet6 => {
+          :address => "2001:bc8:1200:4:dac4:97ff:fe8a:9cfc",
+          :prefix => "64",
+          :gateway => "fe80::a293:51ff:fea2:ded5"
+        }

       }
     }
   }
       }
     }
   }