X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dab73ee6c27617e59aa8d144a3f1b9e8a22dce62..1e408d809fef094506ec508b8c1a8550627f30be:/roles/idris.rb?ds=inline

diff --git a/roles/idris.rb b/roles/idris.rb
index d58457553..0a7f593ab 100644
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -4,11 +4,12 @@ description "Master role applied to idris"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.6",
+        :inet => {
+          :address => "10.0.64.6"
+        },
         :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.102"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::6"
+        :inet => {
+          :address => "184.104.226.102"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::6"
+        }
       }
     }
   }
@@ -37,8 +36,10 @@ run_list(
   "role[hp-g9]",
   "role[chef-server]",
   "role[chef-repository]",
+  "role[dns]",
   "role[git]",
   "role[letsencrypt]",
   "role[oxidized]",
+  "role[supybot]",
   "recipe[serverinfo]"
 )