X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9694d64a67dca98ce1d574852e7114daaff4727f..9a0ecf41db52315877cfca5b6444f0da06122aa4:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index ea87c3b7b..f572b1e28 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -23,6 +23,8 @@
 require "ipaddr"
 require "yaml"
 
+include_recipe "ruby"
+
 keys = data_bag_item("networking", "keys")
 
 file "/etc/netplan/00-installer-config.yaml" do
@@ -76,12 +78,14 @@ node[:networking][:interfaces].each do |name, interface|
     node.default_unless[:networking][:interfaces][name][:inet][:prefix] = role[:inet][:prefix]
     node.default_unless[:networking][:interfaces][name][:inet][:gateway] = role[:inet][:gateway]
     node.default_unless[:networking][:interfaces][name][:inet][:routes] = role[:inet][:routes]
+    node.default_unless[:networking][:interfaces][name][:inet][:rules] = role[:inet][:rules]
   end
 
   if interface[:inet6] && role[:inet6]
     node.default_unless[:networking][:interfaces][name][:inet6][:prefix] = role[:inet6][:prefix]
     node.default_unless[:networking][:interfaces][name][:inet6][:gateway] = role[:inet6][:gateway]
     node.default_unless[:networking][:interfaces][name][:inet6][:routes] = role[:inet6][:routes]
+    node.default_unless[:networking][:interfaces][name][:inet6][:rules] = role[:inet6][:rules]
   end
 
   node.default_unless[:networking][:interfaces][name][:metric] = role[:metric]
@@ -331,6 +335,14 @@ link "/etc/resolv.conf" do
   to "../run/systemd/resolve/stub-resolv.conf"
 end
 
+gem_package "dbus-systemd"
+
+prometheus_exporter "resolved" do
+  port 10028
+  user "systemd-resolve"
+  restrict_address_families "AF_UNIX"
+end
+
 hosts = { :inet => [], :inet6 => [] }
 
 search(:node, "networking:interfaces").collect do |n|