Merge remote-tracking branch 'github/pull/504'

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 749be40e21faf8d122bc096313da1e11155cd91a..c82f3e51134920db11c4a87ac2bbed619379df04 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,33 +2,44 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
+  :bind => {
+    :clients => "bytemark"
+  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.20",
+        :bond => {
+          :slaves => %w[enp2s0f0 enp2s0f1]
+        }
+      },
       :external_ipv4 => {
-        :interface => "em1",
+        :interface => "bond0.214",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.108",
-        :hwaddress => "d8:d3:85:5d:87:a0"
+        :address => "89.16.162.20"
       },
       :external_ipv6 => {
-        :interface => "em1",
+        :interface => "bond0.214",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:dad3:85ff:fe5d:87a0"
-      },
-      :internal_ipv4 => {
-        :interface => "em2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.168",
-        :hwaddress => "d8:d3:85:5d:87:a1"
+        :address => "2001:41c9:2:d6::20"
       }
     }
+  },
+  :planet => {
+    :replication => "disabled"
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl180-g6]"
+  "role[bytemark]",
+  "role[hp-dl180-g6]",
+  "role[gateway]",
+  "role[backup]",
+  "role[planet]"
+  # "role[planetdump]"
 )