Use he.net resolvers in Amsterdam and Dublin

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index 5466c660573fa74d694b08ffd3a9db8c50a388f4..b0edcc1413810a7faa6a2fc4b01f630a0d6630f1 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -4,11 +4,12 @@ description "Master role applied to idris"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.64.6",
+        :inet => {
+          :address => "10.0.64.6"
+        },

         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",


@@ -16,17 +17,15 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },

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

         :interface => "bond0.101",
         :role => :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"
+        }

       }
     }
   }
       }
     }
   }


@@ -35,7 +34,13 @@ default_attributes(
 run_list(
   "role[equinix-dub]",
   "role[hp-g9]",
 run_list(
   "role[equinix-dub]",
   "role[hp-g9]",

+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[dns]",
+  "role[git]",

   "role[letsencrypt]",
   "role[oxidized]",
   "role[letsencrypt]",
   "role[oxidized]",

+  "role[supybot]",
+  "role[apt]",

   "recipe[serverinfo]"
 )
   "recipe[serverinfo]"
 )