X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5c5ffa21ddcce610d5bbf7b3885b08497e85dac4..e29e45b6cf7d91f3349a22b41e6ee5b23887e922:/cookbooks/networking/recipes/default.rb diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 29ea9ad65..8b6b1f35f 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -9,7 +9,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -21,29 +21,143 @@ # * node[:networking][:nameservers] require "ipaddr" +require "yaml" + +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.normal[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix] + node.normal[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway] + end + + node.normal[:networking][:interfaces][name][:metric] = role[:metric] + node.normal[:networking][:interfaces][name][:zone] = role[:zone] + end + + prefix = node[:networking][:interfaces][name][:prefix] + + 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 -node[:networking][:interfaces].each do |name,interface| - if interface[:role] and 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] + 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 - node.default[:networking][:interfaces][name][:metric] = role[:metric] - node.default[:networking][:interfaces][name][:zone] = role[:zone] + 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 - prefix = node[:networking][:interfaces][name][:prefix] +netplan["network"]["bonds"].each_value do |bond| + bond["interfaces"].each do |interface| + netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false } + end +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) +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 0644 + mode 0o644 + content YAML.dump(netplan) +end + +package "cloud-init" do + action :purge end execute "hostname" do @@ -55,52 +169,67 @@ template "/etc/hostname" do source "hostname.erb" owner "root" group "root" - mode 0644 - notifies :run, resources(:execute => "hostname") + mode 0o644 + notifies :run, "execute[hostname]" end template "/etc/hosts" do source "hosts.erb" owner "root" group "root" - mode 0644 + mode 0o644 end -link "/etc/resolv.conf" do - action :delete - link_type :symbolic - to "/run/resolvconf/resolv.conf" - only_if { File.symlink?("/etc/resolv.conf") } +service "systemd-resolved" do + action [:enable, :start] +end + +directory "/etc/systemd/resolved.conf.d" do + owner "root" + group "root" + mode 0o755 end -template "/etc/resolv.conf" do - source "resolv.conf.erb" +template "/etc/systemd/resolved.conf.d/99-chef.conf" do + source "resolved.conf.erb" owner "root" group "root" - mode 0644 + 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| - if interface[:gateway] and interface[:gateway] != interface[:address] + if interface[:gateway] && interface[:gateway] != interface[:address] search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway| - if gateway[:openvpn] - gateway[:openvpn][:tunnels].each_value do |tunnel| - if tunnel[:peer][:address] - route tunnel[:peer][:address] do - netmask "255.255.255.255" - gateway interface[:gateway] - device interface[:interface] - end + next unless gateway[:openvpn] + + gateway[:openvpn][:tunnels].each_value do |tunnel| + if tunnel[:peer][:address] # ~FC023 + route tunnel[:peer][:address] do + netmask "255.255.255.255" + gateway interface[:gateway] + device interface[:interface] end + end + + next unless tunnel[:peer][:networks] - if tunnel[:peer][:networks] - tunnel[:peer][:networks].each do |network| - route network[:address] do - netmask network[:netmask] - gateway interface[:gateway] - device interface[:interface] - end - end + tunnel[:peer][:networks].each do |network| + route network[:address] do + netmask network[:netmask] + gateway interface[:gateway] + device interface[:interface] end end end @@ -108,85 +237,102 @@ node.interfaces(:role => :internal) do |interface| end end -zones = Hash.new +zones = {} search(:node, "networking:interfaces").collect do |n| - if n[:fqdn] != node[:fqdn] - n.interfaces.each do |interface| - if interface[:role] == "external" and interface[:zone] - zones[interface[:zone]] ||= Hash.new - zones[interface[:zone]][interface[:family]] ||= Array.new - zones[interface[:zone]][interface[:family]] << interface[:address] - end - end + next if n[:fqdn] == node[:fqdn] + + n.interfaces.each do |interface| + next unless interface[:role] == "external" && interface[:zone] + + zones[interface[:zone]] ||= {} + zones[interface[:zone]][interface[:family]] ||= [] + zones[interface[:zone]][interface[:family]] << interface[:address] end end package "shorewall" -service "shorewall" do - action [ :enable, :start ] - supports :restart => true - status_command "shorewall status" -end - template "/etc/default/shorewall" do source "shorewall-default.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall") + mode 0o644 + notifies :restart, "service[shorewall]" end template "/etc/shorewall/shorewall.conf" do source "shorewall.conf.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall") + mode 0o644 + notifies :restart, "service[shorewall]" end template "/etc/shorewall/zones" do source "shorewall-zones.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :type => "ipv4" - notifies :restart, resources(:service => "shorewall") + notifies :restart, "service[shorewall]" end template "/etc/shorewall/interfaces" do source "shorewall-interfaces.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall") + mode 0o644 + notifies :restart, "service[shorewall]" end template "/etc/shorewall/hosts" do source "shorewall-hosts.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :zones => zones - notifies :restart, resources(:service => "shorewall") + 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" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall") + mode 0o644 + notifies :restart, "service[shorewall]" end template "/etc/shorewall/rules" do source "shorewall-rules.erb" owner "root" group "root" - mode 0644 - variables :family => "inet", :rules => [] - notifies :restart, resources(:service => "shorewall") + mode 0o644 + variables :family => "inet" + notifies :restart, "service[shorewall]" +end + +service "shorewall" do + action [:enable, :start] + supports :restart => true + status_command "shorewall status" +end + +template "/etc/logrotate.d/shorewall" do + source "logrotate.shorewall.erb" + owner "root" + group "root" + mode 0o644 + variables :name => "shorewall" end firewall_rule "limit-icmp-echo" do @@ -199,15 +345,14 @@ firewall_rule "limit-icmp-echo" do rate_limit "s:1/sec:5" end -[ "ucl", "ic", "bm" ].each do |zone| +%w[ucl ams bm].each do |zone| firewall_rule "accept-openvpn-#{zone}" do action :accept - family :inet source zone dest "fw" proto "udp" - dest_ports "1194:1196" - source_ports "1194:1196" + dest_ports "1194:1197" + source_ports "1194:1197" end end @@ -216,82 +361,99 @@ if node[:roles].include?("gateway") source "shorewall-masq.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall") + mode 0o644 + notifies :restart, "service[shorewall]" end else file "/etc/shorewall/masq" do action :delete - notifies :restart, resources(:service => "shorewall") + notifies :restart, "service[shorewall]" end end -if not node.interfaces(:family => :inet6).empty? +unless node.interfaces(:family => :inet6).empty? package "shorewall6" - service "shorewall6" do - action [ :enable, :start ] - supports :restart => true - status_command "shorewall6 status" - end - template "/etc/default/shorewall6" do source "shorewall-default.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall6") + mode 0o644 + notifies :restart, "service[shorewall6]" end template "/etc/shorewall6/shorewall6.conf" do source "shorewall6.conf.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall6") + mode 0o644 + notifies :restart, "service[shorewall6]" end template "/etc/shorewall6/zones" do source "shorewall-zones.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :type => "ipv6" - notifies :restart, resources(:service => "shorewall6") + notifies :restart, "service[shorewall6]" end template "/etc/shorewall6/interfaces" do source "shorewall6-interfaces.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall6") + mode 0o644 + notifies :restart, "service[shorewall6]" end template "/etc/shorewall6/hosts" do source "shorewall6-hosts.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :zones => zones - notifies :restart, resources(:service => "shorewall6") + 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" group "root" - mode 0644 - notifies :restart, resources(:service => "shorewall6") + mode 0o644 + notifies :restart, "service[shorewall6]" end template "/etc/shorewall6/rules" do source "shorewall-rules.erb" owner "root" group "root" - mode 0644 - variables :family => "inet6", :rules => [] - notifies :restart, resources(:service => "shorewall6") + mode 0o644 + variables :family => "inet6" + notifies :restart, "service[shorewall6]" + end + + service "shorewall6" do + action [:enable, :start] + supports :restart => true + status_command "shorewall6 status" + end + + template "/etc/logrotate.d/shorewall6" do + source "logrotate.shorewall.erb" + owner "root" + group "root" + mode 0o644 + variables :name => "shorewall6" end firewall_rule "limit-icmp6-echo" do @@ -311,6 +473,8 @@ firewall_rule "accept-http" do 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 @@ -319,4 +483,6 @@ firewall_rule "accept-https" do dest "fw" proto "tcp:syn" dest_ports "https" + rate_limit node[:networking][:firewall][:http_rate_limit] + connection_limit node[:networking][:firewall][:http_connection_limit] end