From 9ac3f14227e8bb96030642c60ec7adb51d36f01c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 22 Mar 2019 19:19:07 +0000
Subject: [PATCH] Remove support for old styl resolver configuration

---
 cookbooks/networking/attributes/default.rb |  1 -
 cookbooks/networking/recipes/default.rb    | 59 +++++-----------------
 2 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index b1260170d..f7db87730 100644
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -9,4 +9,3 @@ default[:networking][:firewall][:mangle] = true
 default[:networking][:interfaces] = {}
 default[:networking][:nameservers] = []
 default[:networking][:search] = []
-default[:networking][:resolved] = true
diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 6459a7e9d..ae3a91d00 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -174,53 +174,22 @@ template "/etc/hosts" do
   mode 0o644
 end
 
-if node[:networking][:resolved]
-  service "systemd-resolved" do
-    action [:enable, :start]
-  end
-
-  directory "/etc/systemd/resolved.conf.d" do
-    owner "root"
-    group "root"
-    mode 0o755
-  end
-
-  template "/etc/systemd/resolved.conf.d/99-chef.conf" do
-    source "resolved.conf.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-    notifies :restart, "service[systemd-resolved]"
-  end
-
-  file "/etc/resolv.conf" do
-    action :delete
-    not_if { ::File.symlink?("/etc/resolv.conf") }
-  end
-
-  link "/etc/resolv.conf" do
-    to "../run/systemd/resolve/stub-resolv.conf"
-  end
+service "systemd-resolved" do
+  action [:enable, :start]
+end
 
-  package "resolvconf" do
-    action :purge
-  end
-else
-  unless node[:networking][:nameservers].empty?
-    link "/etc/resolv.conf" do
-      action :delete
-      link_type :symbolic
-      to "/run/resolvconf/resolv.conf"
-      only_if { File.symlink?("/etc/resolv.conf") }
-    end
+directory "/etc/systemd/resolved.conf.d" do
+  owner "root"
+  group "root"
+  mode 0o755
+end
 
-    template "/etc/resolv.conf" do
-      source "resolv.conf.erb"
-      owner "root"
-      group "root"
-      mode 0o644
-    end
-  end
+template "/etc/systemd/resolved.conf.d/99-chef.conf" do
+  source "resolved.conf.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  notifies :restart, "service[systemd-resolved]"
 end
 
 node.interfaces(:role => :internal) do |interface|
-- 
2.43.2