X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3dd5baca2a498497cb9a96a36259bd94c92e20ea..0578a5d0e3acb3ea8d107083d07f07d23b48f62b:/roles/idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index ee56fc85a..7467f67af 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,36 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.102"
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.102",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::6",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.101",
+      :external => {
+        :interface => "bond0.203",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::6"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.102",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::6",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }
       }
     }
   }
@@ -35,5 +55,13 @@ default_attributes(
 run_list(
   "role[equinix-dub]",
   "role[hp-g9]",
-  "role[oxidized]"
+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[dns]",
+  "role[git]",
+  "role[letsencrypt]",
+  "role[oxidized]",
+  "role[supybot]",
+  "role[apt]",
+  "recipe[serverinfo]"
 )