From 8e560396523ba90ad84adf0a1c0f3cfd71912cb0 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 20 Mar 2023 17:19:58 +0000
Subject: [PATCH] Drop support for Ubuntu 18.04

---
 cookbooks/networking/recipes/default.rb       | 40 ++++++-------------
 .../templates/default/wireguard.netdev.erb    |  8 ----
 cookbooks/python/recipes/default.rb           |  5 ---
 3 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index a7006d436..4d3974b96 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -323,35 +323,19 @@ if node[:networking][:wireguard][:enabled]
     mode "644"
   end
 
-  if node[:lsb][:release].to_f < 20.04
-    execute "ip-link-delete-wg0" do
-      action :nothing
-      command "ip link delete wg0"
-      subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
-      only_if { ::File.exist?("/sys/class/net/wg0") }
-    end
-
-    service "systemd-networkd" do
-      action :nothing
-      subscribes :restart, "template[/etc/systemd/network/wireguard.netdev]"
-      subscribes :restart, "template[/etc/systemd/network/wireguard.network]"
-      not_if { kitchen? }
-    end
-  else
-    execute "networkctl-delete-wg0" do
-      action :nothing
-      command "networkctl delete wg0"
-      subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
-      only_if { ::File.exist?("/sys/class/net/wg0") }
-    end
+  execute "networkctl-delete-wg0" do
+    action :nothing
+    command "networkctl delete wg0"
+    subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
+    only_if { ::File.exist?("/sys/class/net/wg0") }
+  end
 
-    execute "networkctl-reload" do
-      action :nothing
-      command "networkctl reload"
-      subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
-      subscribes :run, "template[/etc/systemd/network/wireguard.network]"
-      not_if { kitchen? }
-    end
+  execute "networkctl-reload" do
+    action :nothing
+    command "networkctl reload"
+    subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
+    subscribes :run, "template[/etc/systemd/network/wireguard.network]"
+    not_if { kitchen? }
   end
 end
 
diff --git a/cookbooks/networking/templates/default/wireguard.netdev.erb b/cookbooks/networking/templates/default/wireguard.netdev.erb
index 248bde252..979e68eee 100644
--- a/cookbooks/networking/templates/default/wireguard.netdev.erb
+++ b/cookbooks/networking/templates/default/wireguard.netdev.erb
@@ -3,21 +3,13 @@ Name=wg0
 Kind=wireguard
 
 [WireGuard]
-<% if node[:lsb][:release].to_f < 20.04 -%>
-PrivateKey=<%= IO.read("/var/lib/systemd/wireguard/private.key").chomp %>
-<% else -%>
 PrivateKeyFile=/var/lib/systemd/wireguard/private.key
-<% end -%>
 ListenPort=51820
 <% node[:networking][:wireguard][:peers].sort_by { |p| p[:public_key] }.each do |peer| -%>
 
 [WireGuardPeer]
 PublicKey=<%= peer[:public_key] %>
-<% if node[:lsb][:release].to_f < 20.04 -%>
-PresharedKey=<%= IO.read("/var/lib/systemd/wireguard/preshared.key").chomp %>
-<% else -%>
 PresharedKeyFile=/var/lib/systemd/wireguard/preshared.key
-<% end -%>
 AllowedIPs=<%= Array(peer[:allowed_ips]).sort.join(",") %>
 <% if peer[:endpoint] -%>
 Endpoint=<%= peer[:endpoint] %>
diff --git a/cookbooks/python/recipes/default.rb b/cookbooks/python/recipes/default.rb
index 00f763bac..8abefc794 100644
--- a/cookbooks/python/recipes/default.rb
+++ b/cookbooks/python/recipes/default.rb
@@ -17,11 +17,6 @@
 # limitations under the License.
 #
 
-if node[:lsb][:release].to_f < 20.04
-  package "python"
-  package "python-pip"
-end
-
 package "python3"
 package "python3-pip"
 
-- 
2.43.2