Merge interface families

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index f01d5c6489e1ca2c24d21135aac6379d67691cc6..9985bbda306ebd275d6946dcb81b85bafd67ac9f 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -4,11 +4,12 @@ description "Master role applied to norbert"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.17",
+        :inet => {
+          :address => "10.0.48.17"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,20 +17,20 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.17"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:11"
+        :inet => {
+          :address => "130.117.76.17"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:11"
+        }
       }
-
     }
+  },
+  :planet => {
+    :replication => "enabled"
   }
 )
 
@@ -37,5 +38,7 @@ run_list(
   "role[equinix-ams]",
   "role[geodns]",
   "role[backup]",
-  "role[planet]"
+  "role[planet]",
+  "role[planetdump]",
+  "recipe[tilelog]"
 )