From 714161e93698d14211c319ac58f19695e02a2a6c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 24 Oct 2016 14:07:04 +0100
Subject: [PATCH] Make sure shenron uses the correct network configuration

---
 roles/shenron.rb | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 9323c23ce..84a38aa06 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -21,6 +21,21 @@ default_attributes(
       "it87"
     ]
   },
+  :openvpn => {
+    :address => "10.0.16.3",
+    :tunnels => {
+      :shenron2ucl => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
+      }
+    }
+  }
+)
+
+override_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -40,18 +55,6 @@ default_attributes(
         :gateway => "fe80::1"
       }
     }
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }
   }
 )
 
-- 
2.39.5