Add VPN tunnel from fafnir to IC

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 2a8a1d138d19defd1ee219408961aec53ec22c5f..2345b25654d21b74908ea9b8e3040d4c4a6c9463 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -16,6 +16,18 @@ default_attributes(
       }
     }
   },
       }
     }
   },

+  :openvpn => {
+    :address => "10.0.16.4",
+    :tunnels => {
+      :aws2ic => {
+        :port => "1194",
+        :mode => "client",
+        :peer => {
+          :host => "ironbelly.openstreetmap.org"
+        }
+      }
+    }
+  },

   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {


@@ -38,5 +50,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[aws]"
+  "role[aws]",
+  "recipe[openvpn]"

 )
 )

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 50e22907cf4073d76f8b1796e7b8e0d25e7af98c..13f9652266617ba93e0dcea0e0bd27bdfd60e007 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -59,6 +59,13 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
         :peer => {
           :host => "ridley.openstreetmap.org"
         }

+      },
+      :aws2ic => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }

       }
     }
   },
       }
     }
   },