X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/90f0f02ffef73e9837e9d18e4a3e46930d3d1335..5d1d6e6fe5331ba77867993703c36c2d902933a9:/cookbooks/networking/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index dbbada97d..dfa73f196 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -1,9 +1,9 @@ # -# Cookbook Name:: networking +# Cookbook:: networking # Recipe:: default # -# Copyright 2010, OpenStreetMap Foundation. -# Copyright 2009, Opscode, Inc. +# Copyright:: 2010, OpenStreetMap Foundation. +# Copyright:: 2009, Opscode, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,14 +21,20 @@ # * node[:networking][:nameservers] require "ipaddr" - -network_packages = [] +require "yaml" + +netplan = { + "network" => { + "version" => 2, + "renderer" => "networkd", + "ethernets" => {}, + "bonds" => {}, + "vlans" => {} + } +} node[:networking][:interfaces].each do |name, interface| if interface[:interface] - network_packages |= ["vlan"] if interface[:interface] =~ /\.\d+$/ - network_packages |= ["ifenslave"] if interface[:bond] - if interface[:role] && (role = node[:networking][:roles][interface[:role]]) if role[interface[:family]] node.normal[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix] @@ -43,18 +49,115 @@ node[:networking][:interfaces].each do |name, interface| node.normal[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix) node.normal[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix) + + 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 + + deviceplan["addresses"].push("#{interface[:address]}/#{prefix}") + + if interface[:mtu] + deviceplan["mtu"] = interface[:mtu] + end + + if interface[:bond] + deviceplan["interfaces"] = interface[:bond][:slaves].to_a + + deviceplan["parameters"] = { + "mode" => interface[:bond][:mode] || "active-backup", + "primary" => interface[:bond][:slaves].first, + "mii-monitor-interval" => interface[:bond][:miimon] || 100, + "down-delay" => interface[:bond][:downdelay] || 200, + "up-delay" => interface[:bond][:updelay] || 200 + } + + 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[:gateway] + if interface[:family] == "inet" + default_route = "0.0.0.0/0" + elsif interface[:family] == "inet6" + default_route = "::/0" + end + + 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 + end else node.rm(:networking, :interfaces, name) end end -package network_packages +netplan["network"]["bonds"].each_value do |bond| + bond["interfaces"].each do |interface| + netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false } + end +end + +netplan["network"]["vlans"].each_value do |vlan| + unless vlan["link"] =~ /^bond\d+$/ + netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false } + end +end -template "/etc/network/interfaces" do - source "interfaces.erb" +file "/etc/netplan/01-netcfg.yaml" do + action :delete +end + +file "/etc/netplan/50-cloud-init.yaml" do + action :delete +end + +file "/etc/netplan/99-chef.yaml" do owner "root" group "root" mode 0o644 + content YAML.dump(netplan) +end + +package "cloud-init" do + action :purge end execute "hostname" do @@ -77,20 +180,33 @@ template "/etc/hosts" do mode 0o644 end -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 +service "systemd-resolved" do + action [:enable, :start] +end - template "/etc/resolv.conf" do - source "resolv.conf.erb" - owner "root" - group "root" - mode 0o644 - 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 + +if node[:networking][:tcp_fastopen_key] + fastopen_keys = data_bag_item("networking", "fastopen") + + node.normal[:sysctl][:tcp_fastopen] = { + :comment => "Set shared key for TCP fast open", + :parameters => { + "net.ipv4.tcp_fastopen_key" => fastopen_keys[node[:networking][:tcp_fastopen_key]] + } + } end node.interfaces(:role => :internal) do |interface| @@ -99,7 +215,7 @@ node.interfaces(:role => :internal) do |interface| next unless gateway[:openvpn] gateway[:openvpn][:tunnels].each_value do |tunnel| - if tunnel[:peer][:address] # ~FC023 + if tunnel[:peer][:address] route tunnel[:peer][:address] do netmask "255.255.255.255" gateway interface[:gateway] @@ -179,6 +295,15 @@ template "/etc/shorewall/hosts" do notifies :restart, "service[shorewall]" end +template "/etc/shorewall/conntrack" do + source "shorewall-conntrack.erb" + owner "root" + group "root" + mode 0o644 + notifies :restart, "service[shorewall]" + only_if { node[:networking][:firewall][:raw] } +end + template "/etc/shorewall/policy" do source "shorewall-policy.erb" owner "root" @@ -223,7 +348,6 @@ end %w[ucl ams bm].each do |zone| firewall_rule "accept-openvpn-#{zone}" do action :accept - family :inet source zone dest "fw" proto "udp" @@ -292,6 +416,15 @@ unless node.interfaces(:family => :inet6).empty? notifies :restart, "service[shorewall6]" end + template "/etc/shorewall6/conntrack" do + source "shorewall-conntrack.erb" + owner "root" + group "root" + mode 0o644 + notifies :restart, "service[shorewall6]" + only_if { node[:networking][:firewall][:raw] } + end + template "/etc/shorewall6/policy" do source "shorewall-policy.erb" owner "root"