tilecache: Remove USA peers from NZ caches

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index af13c4bafff56b18ea4cd53fc927ae0bb2498131..be3a48e3f3954443c5a7b5cb6493a9524514a29c 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -4,32 +4,67 @@ description "Master role applied to grisu"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.20",
+        :bond => {
+          :slaves => %w[em1 em2]
+        }
+      },
       :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"
+        :address => "2001:41c9:2:d6::20"
+      }
+    }
+  },
+  :openvpn => {
+    :address => "10.0.16.5",
+    :tunnels => {
+      :ic2bm => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ironbelly.openstreetmap.org"
+        }
       },
-      :internal_ipv4 => {
-        :interface => "em2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.168",
-        :hwaddress => "d8:d3:85:5d:87:a1"
+      :aws2bm => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
+      },
+      :ucl2bm => {
+        :port => "1196",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
       }
     }
+  },
+  :planet => {
+    :replication => "disabled"
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[bytemark]",
   "role[hp-dl180-g6]",
-  "role[imagery]"
+  "role[gateway]",
+  "role[web-storage]",
+  "role[backup]",
+  "role[planet]",
+  # "role[planetdump]",
+  "recipe[openvpn]"
 )