X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4e2cced9d45ffc653349dc6b1d04906e306b4914..55c8e16ebbefa2bb557b49c78275ff61cf6ac703:/cookbooks/networking/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 45de97872..89e8198e2 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. @@ -23,7 +23,7 @@ require "ipaddr" require "yaml" -network_packages = [] +package "netplan.io" netplan = { "network" => { @@ -37,13 +37,11 @@ netplan = { 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] node.normal[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway] + node.normal[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes] end node.normal[:networking][:interfaces][name][:metric] = role[:metric] @@ -55,139 +53,128 @@ 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) - if node[:networking][:netplan] - 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[: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 - } + 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 - 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[:bond] + deviceplan["interfaces"] = interface[:bond][:slaves].to_a - if interface[:gateway] - if interface[:family] == "inet" - default_route = "0.0.0.0/0" - elsif interface[:family] == "inet6" - default_route = "::/0" - end + 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" => default_route, - "via" => interface[:gateway], - "metric" => interface[:metric], - "on-link" => true + "to" => interface[:gateway], + "scope" => "link" ) - - # 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 end - else - node.rm(:networking, :interfaces, name) - end -end - -if node[:networking][:netplan] - package "netplan.io" - - file "/etc/netplan/01-netcfg.yaml" do - action :delete - end - file "/etc/netplan/50-cloud-init.yaml" do - action :delete - end + if interface[:routes] + interface[:routes].each do |to, parameters| + route = { + "to" => to + } - netplan["network"]["bonds"].each_value do |bond| - bond["interfaces"].each do |interface| - netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false } - end - end + route["type"] = parameters[:type] if parameters[:type] + route["via"] = parameters[:via] if parameters[:via] + route["metric"] = parameters[:metric] if parameters[:metric] - netplan["network"]["vlans"].each_value do |vlan| - unless vlan["link"] =~ /^bond\d+$/ - netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false } + deviceplan["routes"].push(route) + end end + else + node.rm(:networking, :interfaces, name) end +end - file "/etc/netplan/99-chef.yaml" do - owner "root" - group "root" - mode 0o644 - content YAML.dump(netplan) - end - - service "networking" do - action :disable +netplan["network"]["bonds"].each_value do |bond| + bond["interfaces"].each do |interface| + netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false } end +end - file "/etc/network/interfaces" do - action :delete +netplan["network"]["vlans"].each_value do |vlan| + unless vlan["link"] =~ /^bond\d+$/ + netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false } end +end - package "ifupdown" do - action :purge - end +file "/etc/netplan/01-netcfg.yaml" do + action :delete +end - file "/etc/cloud/cloud.cfg.d/99-chef.cfg" do - action :delete - end +file "/etc/netplan/50-cloud-init.yaml" do + action :delete +end - package "cloud-init" do - action :purge - end -else - package network_packages +file "/etc/netplan/99-chef.yaml" do + owner "root" + group "root" + mode 0o644 + content YAML.dump(netplan) +end - template "/etc/network/interfaces" do - source "interfaces.erb" - owner "root" - group "root" - mode 0o644 - end +package "cloud-init" do + action :purge end execute "hostname" do @@ -208,31 +195,56 @@ template "/etc/hosts" do owner "root" group "root" mode 0o644 + not_if { ENV["TEST_KITCHEN"] } 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 +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]", :immediately +end + +if node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"] + mount "/etc/resolv.conf" do + action :umount + device node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"][:devices].first end end +link "/etc/resolv.conf" do + to "../run/systemd/resolve/stub-resolv.conf" +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] && interface[:gateway] != interface[:address] search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway| 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]