Rename MaxRequestsPerChild to MaxConnectionsPerChild

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 2a8a1d138d19defd1ee219408961aec53ec22c5f..099fc38bb0114f297d3f4f042e489f9c587275ce 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -13,6 +13,32 @@ default_attributes(
         :family => :inet,
         :address => "172.31.10.210",
         :hwaddress => "02:c1:c5:8b:5f:1d"
+      },
+      :external_ipv4 => {
+        :role => :external,
+        :family => :inet,
+        :address => "52.50.86.69"
+      }
+    }
+  },
+  :openvpn => {
+    :address => "10.0.16.4",
+    :tunnels => {
+      :aws2ic => {
+        :port => "1194",
+        :mode => "client",
+        :peer => {
+          :host => "ironbelly.openstreetmap.org",
+          :port => "1195"
+        }
+      },
+      :aws2bm => {
+        :port => "1195",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1195"
+        }
       }
     }
   },
@@ -38,5 +64,7 @@ default_attributes(
 )
 
 run_list(
-  "role[aws]"
+  "role[aws]",
+  "role[db-slave]",
+  "recipe[openvpn]"
 )