Switch 2 new switch2osm.org site

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index bd0cb806574fa6b662158b426be04affc479079f..8e177a8ff49ea2781610271c2015f8c0236587d8 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,6 +2,9 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
+  :bind => {
+    :clients => "bytemark"
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -10,7 +13,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.20",
         :bond => {
-          :slaves => %w(em1 em2)
+          :slaves => %w[em1 em2]
         }
       },
       :external_ipv4 => {
@@ -30,21 +33,31 @@ default_attributes(
   :openvpn => {
     :address => "10.0.16.5",
     :tunnels => {
-      :aws2bm => {
+      :ic2bm => {
         :port => "1194",
         :mode => "server",
         :peer => {
           :host => "ironbelly.openstreetmap.org"
         }
       },
-      :ic2bm => {
+      :aws2bm => {
         :port => "1195",
         :mode => "server",
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }
+      },
+      :ucl2bm => {
+        :port => "1196",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
       }
     }
+  },
+  :planet => {
+    :replication => "disabled"
   }
 )
 
@@ -53,6 +66,8 @@ run_list(
   "role[hp-dl180-g6]",
   "role[gateway]",
   "role[web-storage]",
+  "role[backup]",
   "role[planet]",
+  # "role[planetdump]",
   "recipe[openvpn]"
 )