Merge remote-tracking branch 'github/pull/578'

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index f0edbfdfe98c234548e96782bd6c5d4654607c73..516c925d39f5e81073d242ca1d7a88425287596a 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -4,12 +4,14 @@ description "Role applied to all servers at UCL"
 default_attributes(
   :location => "Slough, England",
   :networking => {
-    :netplan => true,
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.0.3"
+          :gateway => "10.0.0.3",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.0.3" }
+          }
         }
       },
       :external => {
@@ -19,6 +21,9 @@ default_attributes(
           :gateway => "193.60.236.254"
         }
       }
+    },
+    :wireguard => {
+      :keepalive => 180
     }
   }
 )