Remove expired apt keys

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 2345b25654d21b74908ea9b8e3040d4c4a6c9463..099fc38bb0114f297d3f4f042e489f9c587275ce 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -13,6 +13,11 @@ 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"
       }
     }
   },
@@ -23,7 +28,16 @@ default_attributes(
         :port => "1194",
         :mode => "client",
         :peer => {
-          :host => "ironbelly.openstreetmap.org"
+          :host => "ironbelly.openstreetmap.org",
+          :port => "1195"
+        }
+      },
+      :aws2bm => {
+        :port => "1195",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1195"
         }
       }
     }
@@ -51,5 +65,6 @@ default_attributes(
 
 run_list(
   "role[aws]",
+  "role[db-slave]",
   "recipe[openvpn]"
 )