Move Dublin hosts to use interface inheritance for network configuration

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 9bc6d165cf8380d0148f1f97220634415c2c1dff..2ef8ebd84b9da563fafb9c77978fee33138c1c37 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -4,32 +4,36 @@ description "Master role applied to konqi"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.7",
+      :internal => {
+        :inet => {
+          :address => "10.0.64.7"
+        },
         :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.103"
+      :henet => {
+        :inet => {
+          :address => "184.104.226.103"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::7"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::7"
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.103"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::7"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix-dub]",
-  "role[hp-g9]"
+  "role[equinix-dub-public]",
+  "role[hp-g9]",
+  "role[wiki]"
 )