X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/57d39f25fd8e302f19b49c55308cc24d7ca3047d..faa2a90a9faad75ac0b94af188fbc9b742fee47a:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 2ec9691a4..7731511c0 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -25,164 +25,306 @@ require "yaml"
 
 keys = data_bag_item("networking", "keys")
 
-package "netplan.io"
-
-netplan = {
-  "network" => {
-    "version" => 2,
-    "renderer" => "networkd",
-    "ethernets" => {},
-    "bonds" => {},
-    "vlans" => {}
+if node[:networking][:engine] == "netplan"
+  package "netplan.io"
+
+  netplan = {
+    "network" => {
+      "version" => 2,
+      "renderer" => "networkd",
+      "ethernets" => {},
+      "bonds" => {},
+      "vlans" => {}
+    }
   }
-}
-
-node[:networking][:interfaces].each do |name, interface|
-  if interface[:interface]
-    if interface[:role] && (role = node[:networking][:roles][interface[:role]])
-      if role[interface[:family]]
-        node.default[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
-        node.default[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
-        node.default[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes]
+
+  node[:networking][:interfaces].each do |name, interface|
+    if interface[:interface]
+      if interface[:role] && (role = node[:networking][:roles][interface[:role]])
+        if interface[:inet] && role[:inet]
+          node.default[:networking][:interfaces][name][:inet][:prefix] = role[:inet][:prefix]
+          node.default[:networking][:interfaces][name][:inet][:gateway] = role[:inet][:gateway]
+          node.default[:networking][:interfaces][name][:inet][:routes] = role[:inet][:routes]
+        end
+
+        if interface[:inet6] && role[:inet6]
+          node.default[:networking][:interfaces][name][:inet6][:prefix] = role[:inet6][:prefix]
+          node.default[:networking][:interfaces][name][:inet6][:gateway] = role[:inet6][:gateway]
+          node.default[:networking][:interfaces][name][:inet6][:routes] = role[:inet6][:routes]
+        end
+
+        node.default[:networking][:interfaces][name][:metric] = role[:metric]
+        node.default[:networking][:interfaces][name][:zone] = role[:zone]
       end
 
-      node.default[:networking][:interfaces][name][:metric] = role[:metric]
-      node.default[:networking][:interfaces][name][:zone] = role[:zone]
-    end
+      interface = node[:networking][:interfaces][name]
+
+      deviceplan = if interface[:interface] =~ /^(.*)\.(\d+)$/
+                     netplan["network"]["vlans"][interface[:interface]] ||= {
+                       "id" => Regexp.last_match(2).to_i,
+                       "link" => Regexp.last_match(1),
+                       "accept-ra" => false,
+                       "addresses" => [],
+                       "routes" => []
+                     }
+                   elsif interface[:interface] =~ /^bond\d+$/
+                     netplan["network"]["bonds"][interface[:interface]] ||= {
+                       "accept-ra" => false,
+                       "addresses" => [],
+                       "routes" => []
+                     }
+                   else
+                     netplan["network"]["ethernets"][interface[:interface]] ||= {
+                       "accept-ra" => false,
+                       "addresses" => [],
+                       "routes" => []
+                     }
+                   end
+
+      if interface[:inet]
+        deviceplan["addresses"].push("#{interface[:inet][:address]}/#{interface[:inet][:prefix]}")
+      end
 
-    if interface[:address]
-      prefix = node[:networking][:interfaces][name][:prefix]
+      if interface[:inet6]
+        deviceplan["addresses"].push("#{interface[:inet6][:address]}/#{interface[:inet6][:prefix]}")
+      end
+
+      if interface[:mtu]
+        deviceplan["mtu"] = interface[:mtu]
+      end
 
-      node.default[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
-      node.default[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
+      if interface[:bond]
+        deviceplan["interfaces"] = interface[:bond][:slaves].to_a
+
+        deviceplan["parameters"] = {
+          "mode" => interface[:bond][:mode] || "active-backup",
+          "mii-monitor-interval" => interface[:bond][:miimon] || 100,
+          "down-delay" => interface[:bond][:downdelay] || 200,
+          "up-delay" => interface[:bond][:updelay] || 200
+        }
+
+        deviceplan["parameters"]["primary"] = interface[:bond][:slaves].first if deviceplan["parameters"]["mode"] == "active-backup"
+        deviceplan["parameters"]["transmit-hash-policy"] = interface[:bond][:xmithashpolicy] if interface[:bond][:xmithashpolicy]
+        deviceplan["parameters"]["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
+      end
+
+      if interface[:inet]
+        if interface[:inet][:gateway] && interface[:inet][:gateway] != interface[:inet][:address]
+          deviceplan["routes"].push(
+            "to" => "0.0.0.0/0",
+            "via" => interface[:inet][:gateway],
+            "metric" => interface[:metric],
+            "on-link" => true
+          )
+        end
+
+        if interface[:inet][:routes]
+          interface[:inet][:routes].each do |to, parameters|
+            next if parameters[:via] == interface[:inet][:address]
+
+            route = {
+              "to" => to
+            }
+
+            route["type"] = parameters[:type] if parameters[:type]
+            route["via"] = parameters[:via] if parameters[:via]
+            route["metric"] = parameters[:metric] if parameters[:metric]
+
+            deviceplan["routes"].push(route)
+          end
+        end
+      end
+
+      if interface[:inet6]
+        if interface[:inet6][:gateway] && interface[:inet6][:gateway] != interface[:inet6][:address]
+          deviceplan["routes"].push(
+            "to" => "::/0",
+            "via" => interface[:inet6][:gateway],
+            "metric" => interface[:metric],
+            "on-link" => true
+          )
+
+          # This ordering relies on systemd-networkd adding routes
+          # in reverse order and will need moving before the previous
+          # route once that is fixed:
+          #
+          # https://github.com/systemd/systemd/issues/5430
+          # https://github.com/systemd/systemd/pull/10938
+          if !IPAddr.new(interface[:inet6][:address]).mask(interface[:inet6][:prefix]).include?(interface[:inet6][:gateway]) &&
+             !IPAddr.new("fe80::/64").include?(interface[:inet6][:gateway])
+            deviceplan["routes"].push(
+              "to" => interface[:inet6][:gateway],
+              "scope" => "link"
+            )
+          end
+        end
+
+        if interface[:inet6][:routes]
+          interface[:inet6][:routes].each do |to, parameters|
+            next if parameters[:via] == interface[:inet6][:address]
+
+            route = {
+              "to" => to
+            }
+
+            route["type"] = parameters[:type] if parameters[:type]
+            route["via"] = parameters[:via] if parameters[:via]
+            route["metric"] = parameters[:metric] if parameters[:metric]
+
+            deviceplan["routes"].push(route)
+          end
+        end
+      end
+    else
+      node.rm(:networking, :interfaces, name)
     end
+  end
 
-    interface = node[:networking][:interfaces][name]
-
-    deviceplan = if interface[:interface] =~ /^(.*)\.(\d+)$/
-                   netplan["network"]["vlans"][interface[:interface]] ||= {
-                     "id" => Regexp.last_match(2).to_i,
-                     "link" => Regexp.last_match(1),
-                     "accept-ra" => false,
-                     "addresses" => [],
-                     "routes" => []
-                   }
-                 elsif interface[:interface] =~ /^bond\d+$/
-                   netplan["network"]["bonds"][interface[:interface]] ||= {
-                     "accept-ra" => false,
-                     "addresses" => [],
-                     "routes" => []
-                   }
-                 else
-                   netplan["network"]["ethernets"][interface[:interface]] ||= {
-                     "accept-ra" => false,
-                     "addresses" => [],
-                     "routes" => []
-                   }
-                 end
-
-    if interface[:address]
-      deviceplan["addresses"].push("#{interface[:address]}/#{prefix}")
+  netplan["network"]["bonds"].each_value do |bond|
+    bond["interfaces"].each do |interface|
+      netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false, "optional" => true }
     end
+  end
 
-    if interface[:mtu]
-      deviceplan["mtu"] = interface[:mtu]
+  netplan["network"]["vlans"].each_value do |vlan|
+    unless vlan["link"] =~ /^bond\d+$/
+      netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false }
     end
+  end
+
+  file "/etc/netplan/00-installer-config.yaml" do
+    action :delete
+  end
 
-    if interface[:bond]
-      deviceplan["interfaces"] = interface[:bond][:slaves].to_a
+  file "/etc/netplan/01-netcfg.yaml" do
+    action :delete
+  end
 
-      deviceplan["parameters"] = {
-        "mode" => interface[:bond][:mode] || "active-backup",
-        "mii-monitor-interval" => interface[:bond][:miimon] || 100,
-        "down-delay" => interface[:bond][:downdelay] || 200,
-        "up-delay" => interface[:bond][:updelay] || 200
-      }
+  file "/etc/netplan/50-cloud-init.yaml" do
+    action :delete
+  end
+
+  file "/etc/netplan/99-chef.yaml" do
+    owner "root"
+    group "root"
+    mode "644"
+    content YAML.dump(netplan)
+  end
+elsif node[:networking][:engine] == "systemd-networkd"
+  file "/etc/netplan/99-chef.yaml" do
+    action :delete
+  end
+
+  package "netplan.io" do
+    action :purge
+  end
+
+  interfaces = node[:networking][:interfaces].collect do |name, interface|
+    [interface[:interface], name]
+  end.to_h
 
-      deviceplan["parameters"]["primary"] = interface[:bond][:slaves].first if deviceplan["parameters"]["mode"] == "active-backup"
-      deviceplan["parameters"]["transmit-hash-policy"] = interface[:bond][:xmithashpolicy] if interface[:bond][:xmithashpolicy]
-      deviceplan["parameters"]["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
+  node[:networking][:interfaces].each do |name, interface|
+    if interface[:interface] =~ /^(.*)\.(\d+)$/
+      vlan_interface = Regexp.last_match(1)
+      vlan_id = Regexp.last_match(2)
+
+      parent = interfaces[vlan_interface] || "vlans_#{vlan_interface}"
+
+      node.default_unless[:networking][:interfaces][parent][:interface] = vlan_interface,
+      node.default_unless[:networking][:interfaces][parent][:vlans] = []
+
+      node.default[:networking][:interfaces][parent][:vlans] << vlan_id
     end
 
-    if interface[:gateway] && interface[:gateway] != interface[:address]
-      if interface[:family] == "inet"
-        default_route = "0.0.0.0/0"
-      elsif interface[:family] == "inet6"
-        default_route = "::/0"
-      end
+    next unless interface[:role] && (role = node[:networking][:roles][interface[:role]])
 
-      deviceplan["routes"].push(
-        "to" => default_route,
-        "via" => interface[:gateway],
-        "metric" => interface[:metric],
-        "on-link" => true
-      )
-
-      # This ordering relies on systemd-networkd adding routes
-      # in reverse order and will need moving before the previous
-      # route once that is fixed:
-      #
-      # https://github.com/systemd/systemd/issues/5430
-      # https://github.com/systemd/systemd/pull/10938
-      if interface[:family] == "inet6" &&
-         !interface[:network].include?(interface[:gateway]) &&
-         !IPAddr.new("fe80::/64").include?(interface[:gateway])
-        deviceplan["routes"].push(
-          "to" => interface[:gateway],
-          "scope" => "link"
-        )
-      end
+    if interface[:inet] && role[:inet]
+      node.default[:networking][:interfaces][name][:inet][:prefix] = role[:inet][:prefix]
+      node.default[:networking][:interfaces][name][:inet][:gateway] = role[:inet][:gateway]
+      node.default[:networking][:interfaces][name][:inet][:routes] = role[:inet][:routes]
     end
 
-    if interface[:routes]
-      interface[:routes].each do |to, parameters|
-        next if parameters[:via] == interface[:address]
+    if interface[:inet6] && role[:inet6]
+      node.default[:networking][:interfaces][name][:inet6][:prefix] = role[:inet6][:prefix]
+      node.default[:networking][:interfaces][name][:inet6][:gateway] = role[:inet6][:gateway]
+      node.default[:networking][:interfaces][name][:inet6][:routes] = role[:inet6][:routes]
+    end
 
-        route = {
-          "to" => to
-        }
+    node.default[:networking][:interfaces][name][:metric] = role[:metric]
+    node.default[:networking][:interfaces][name][:zone] = role[:zone]
+  end
 
-        route["type"] = parameters[:type] if parameters[:type]
-        route["via"] = parameters[:via] if parameters[:via]
-        route["metric"] = parameters[:metric] if parameters[:metric]
+  node[:networking][:interfaces].each do |_, interface|
+    file "/run/systemd/network/10-netplan-#{interface[:interface]}.netdev" do
+      action :delete
+    end
 
-        deviceplan["routes"].push(route)
+    if interface[:interface] =~ /^.*\.(\d+)$/
+      template "/etc/systemd/network/10-#{interface[:interface]}.netdev" do
+        source "vlan.netdev.erb"
+        owner "root"
+        group "root"
+        mode "644"
+        variables :interface => interface, :vlan => Regexp.last_match(1)
+        notifies :run, "execute[networkctl-delete-#{interface[:interface]}]"
+        notifies :run, "notify_group[networkctl-reload]"
       end
-    end
-  else
-    node.rm(:networking, :interfaces, name)
-  end
-end
 
-netplan["network"]["bonds"].each_value do |bond|
-  bond["interfaces"].each do |interface|
-    netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false, "optional" => true }
-  end
-end
+      execute "networkctl-delete-#{interface[:interface]}" do
+        action :nothing
+        command "networkctl delete #{interface[:interface]}"
+        only_if { ::File.exist?("/sys/class/net/#{interface[:interface]}") }
+      end
+    elsif interface[:interface] =~ /^bond\d+$/
+      template "/etc/systemd/network/10-#{interface[:interface]}.netdev" do
+        source "bond.netdev.erb"
+        owner "root"
+        group "root"
+        mode "644"
+        variables :interface => interface
+        notifies :run, "execute[networkctl-delete-#{interface[:interface]}]"
+        notifies :run, "notify_group[networkctl-reload]"
+      end
 
-netplan["network"]["vlans"].each_value do |vlan|
-  unless vlan["link"] =~ /^bond\d+$/
-    netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false }
-  end
-end
+      execute "networkctl-delete-#{interface[:interface]}" do
+        action :nothing
+        command "networkctl delete #{interface[:interface]}"
+        only_if { ::File.exist?("/sys/class/net/#{interface[:interface]}") }
+      end
 
-file "/etc/netplan/00-installer-config.yaml" do
-  action :delete
-end
+      interface[:bond][:slaves].each do |slave|
+        file "/run/systemd/network/10-netplan-#{slave}.network" do
+          action :delete
+        end
+
+        template "/etc/systemd/network/10-#{slave}.network" do
+          source "slave.network.erb"
+          owner "root"
+          group "root"
+          mode "644"
+          variables :master => interface, :slave => slave
+          notifies :run, "notify_group[networkctl-reload]"
+        end
+      end
+    end
 
-file "/etc/netplan/01-netcfg.yaml" do
-  action :delete
-end
+    file "/run/systemd/network/10-netplan-#{interface[:interface]}.network" do
+      action :delete
+    end
 
-file "/etc/netplan/50-cloud-init.yaml" do
-  action :delete
-end
+    template "/etc/systemd/network/10-#{interface[:interface]}.network" do
+      source "network.erb"
+      owner "root"
+      group "root"
+      mode "644"
+      variables :interface => interface
+      notifies :run, "notify_group[networkctl-reload]"
+    end
+  end
 
-file "/etc/netplan/99-chef.yaml" do
-  owner "root"
-  group "root"
-  mode "644"
-  content YAML.dump(netplan)
+  service "systemd-networkd" do
+    action [:enable, :start]
+  end
 end
 
 package "cloud-init" do
@@ -230,9 +372,7 @@ if node[:networking][:wireguard][:enabled]
       next if gateway.name == node.name
       next unless gateway[:networking][:wireguard] && gateway[:networking][:wireguard][:enabled]
 
-      allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
-        "#{interface[:network]}/#{interface[:prefix]}"
-      end
+      allowed_ips = gateway.ipaddresses(:role => :internal).map(&:subnet)
 
       node.default[:networking][:wireguard][:peers] << {
         :public_key => gateway[:networking][:wireguard][:public_key],
@@ -242,9 +382,7 @@ if node[:networking][:wireguard][:enabled]
     end
 
     search(:node, "roles:prometheus") do |server|
-      allowed_ips = server.interfaces(:role => :internal).map do |interface|
-        "#{interface[:network]}/#{interface[:prefix]}"
-      end
+      allowed_ips = server.ipaddresses(:role => :internal).map(&:subnet)
 
       if server[:networking][:private_address]
         allowed_ips << "#{server[:networking][:private_address]}/32"
@@ -278,9 +416,7 @@ if node[:networking][:wireguard][:enabled]
     }
   elsif node[:roles].include?("shenron")
     search(:node, "roles:gateway") do |gateway|
-      allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
-        "#{interface[:network]}/#{interface[:prefix]}"
-      end
+      allowed_ips = gateway.ipaddresses(:role => :internal).map(&:subnet)
 
       node.default[:networking][:wireguard][:peers] << {
         :public_key => gateway[:networking][:wireguard][:public_key],
@@ -290,50 +426,45 @@ if node[:networking][:wireguard][:enabled]
     end
   end
 
-  template "/etc/systemd/network/wireguard.netdev" do
+  file "/etc/systemd/network/wireguard.netdev" do
+    action :delete
+  end
+
+  template "/etc/systemd/network/10-wg0.netdev" do
     source "wireguard.netdev.erb"
     owner "root"
     group "systemd-network"
     mode "640"
+    notifies :run, "execute[networkctl-delete-wg0]"
+    notifies :run, "notify_group[networkctl-reload]"
   end
 
-  template "/etc/systemd/network/wireguard.network" do
+  file "/etc/systemd/network/wireguard.network" do
+    action :delete
+  end
+
+  template "/etc/systemd/network/10-wg0.network" do
     source "wireguard.network.erb"
     owner "root"
     group "root"
     mode "644"
+    notifies :run, "execute[networkctl-reload]"
   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
+  execute "networkctl-delete-wg0" do
+    action :nothing
+    command "networkctl delete wg0"
+    only_if { ::File.exist?("/sys/class/net/wg0") }
+  end
+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
+notify_group "networkctl-reload"
 
-    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
+execute "networkctl-reload" do
+  action :nothing
+  command "networkctl reload"
+  subscribes :run, "notify_group[networkctl-reload]"
+  not_if { kitchen? && node[:networking][:engine] == "netplan" }
 end
 
 ohai "reload-hostname" do
@@ -383,7 +514,7 @@ link "/etc/resolv.conf" do
   to "../run/systemd/resolve/stub-resolv.conf"
 end
 
-hosts = { "inet" => [], "inet6" => [] }
+hosts = { :inet => [], :inet6 => [] }
 
 search(:node, "networking:interfaces").collect do |n|
   next if n[:fqdn] == node[:fqdn]
@@ -391,7 +522,8 @@ search(:node, "networking:interfaces").collect do |n|
   n.interfaces.each do |interface|
     next unless interface[:role] == "external"
 
-    hosts[interface[:family]] << interface[:address]
+    hosts[:inet] << interface[:inet][:address] if interface[:inet]
+    hosts[:inet6] << interface[:inet6][:address] if interface[:inet6]
   end
 end
 
@@ -409,20 +541,34 @@ template "/etc/nftables.conf" do
   group "root"
   mode "755"
   variables :interfaces => interfaces, :hosts => hosts
-  notifies :restart, "service[nftables]"
+  notifies :reload, "service[nftables]"
 end
 
-stop_commands = [
-  "/usr/sbin/nft delete table inet filter"
-]
+directory "/var/lib/nftables" do
+  owner "root"
+  group "root"
+  mode "755"
+end
 
-stop_commands << "/usr/sbin/nft delete table ip nat" if node[:roles].include?("gateway")
+template "/usr/local/bin/nftables" do
+  source "nftables.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end
 
 systemd_service "nftables-stop" do
+  action :delete
   service "nftables"
   dropin "stop"
-  exec_reload ""
-  exec_stop stop_commands
+end
+
+systemd_service "nftables-chef" do
+  service "nftables"
+  dropin "chef"
+  exec_start "/usr/local/bin/nftables start"
+  exec_reload "/usr/local/bin/nftables reload"
+  exec_stop "/usr/local/bin/nftables stop"
 end
 
 if node[:networking][:firewall][:enabled]
@@ -436,17 +582,11 @@ else
 end
 
 if node[:networking][:wireguard][:enabled]
-  wireguard_source = if node[:roles].include?("gateway")
-                       "net"
-                     else
-                       "osm"
-                     end
-
   firewall_rule "accept-wireguard" do
     action :accept
-    source wireguard_source
-    dest "fw"
-    proto "udp"
+    context :incoming
+    protocol :udp
+    source :osm unless node[:roles].include?("gateway")
     dest_ports "51820"
     source_ports "51820"
   end
@@ -454,20 +594,9 @@ end
 
 firewall_rule "accept-http" do
   action :accept
-  source "net"
-  dest "fw"
-  proto "tcp:syn"
-  dest_ports "http"
-  rate_limit node[:networking][:firewall][:http_rate_limit]
-  connection_limit node[:networking][:firewall][:http_connection_limit]
-end
-
-firewall_rule "accept-https" do
-  action :accept
-  source "net"
-  dest "fw"
-  proto "tcp:syn"
-  dest_ports "https"
+  context :incoming
+  protocol :tcp
+  dest_ports %w[http https]
   rate_limit node[:networking][:firewall][:http_rate_limit]
   connection_limit node[:networking][:firewall][:http_connection_limit]
 end