Improve blackholing of AWS routes on he.net

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index f683cd17e0750eeee5fee8dfe2c304c67d513280..2a91aaf733c66723db6b92a93042c41642dbf9b1 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -4,32 +4,44 @@ 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 => {
-          :slaves => %w[eno1 eno2]
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
-        :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.2",
-        :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[hp-g9]"
+  "role[equinix-dub-public]",
+  "role[hp-g9]",
+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[dns]",
+  "role[git]",
+  "role[letsencrypt]",
+  "role[oxidized]",
+  "role[supybot]",
+  "role[apt]",
+  "recipe[serverinfo]"
 )