From: Tom Hughes <tom@compton.nu>
Date: Thu, 19 Jan 2023 18:50:50 +0000 (+0000)
Subject: Drop wireguard tunnels from shenron to data centres
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/46e5689ae155453dbe7bd7b775c21e53dcd0553d

Drop wireguard tunnels from shenron to data centres
---

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 9bf834522..8ec499d13 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -241,7 +241,7 @@ if node[:networking][:wireguard][:enabled]
       }
     end
 
-    search(:node, "roles:shenron OR roles:prometheus") do |server|
+    search(:node, "roles:prometheus") do |server|
       allowed_ips = server.interfaces(:role => :internal).map do |interface|
         "#{interface[:network]}/#{interface[:prefix]}"
       end
diff --git a/roles/shenron.rb b/roles/shenron.rb
index 564b309ae..56e2a3ed3 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -41,8 +41,7 @@ override_attributes(
         :prefix => "64",
         :gateway => "fe80::1"
       }
-    },
-    :private_address => "10.0.16.100"
+    }
   }
 )