X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/68e068818d559ef35bdf2a138a93596337828ef9..d54777514c0bb1fe1091c584aa4583041d42e1cf:/roles/idris.rb?ds=sidebyside

diff --git a/roles/idris.rb b/roles/idris.rb
index 276d45ae7..2a91aaf73 100644
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -4,36 +4,36 @@ description "Master role applied to idris"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.6",
+      :internal => {
+        :inet => {
+          :address => "10.0.64.6"
+        },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet,
-        :address => "184.104.226.102"
+      :henet => {
+        :inet => {
+          :address => "184.104.226.102"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::6"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::6"
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.102"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::6"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[chef-server]",
   "role[chef-repository]",
@@ -41,5 +41,7 @@ run_list(
   "role[git]",
   "role[letsencrypt]",
   "role[oxidized]",
+  "role[supybot]",
+  "role[apt]",
   "recipe[serverinfo]"
 )