Drop ascalon role

[chef.git] / roles / horntail.rb

diff --git a/roles/horntail.rb b/roles/horntail.rb
index 8d1742da19a1ba9bb6630616c05ee421dd271f5d..afaf9460d07e3238220b08091618e8e85423ca9c 100644 (file)
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -4,34 +4,35 @@ description "Master role applied to horntail"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.10",
+        :inet => {
+          :address => "10.0.64.10"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[eno1 eno2 eno3 eno4]
+          :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.106"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::a"
+        :inet => {
+          :address => "184.104.226.106"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::a"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix-dub]"
+  "role[equinix-dub]",
+  "role[geodns]",
+  "role[planet]"
 )