Update bundle

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 51f3f4389aa1eb7dd4ec5f2078080e47131ac6e5..5c73c5cc3197be9d99e10ecf32d0377f33d1fab0 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -1,9 +1,9 @@
 #
 #

-# Cookbook Name:: networking
+# Cookbook:: networking

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -21,76 +21,223 @@
 # * node[:networking][:nameservers]
 
 require "ipaddr"
 # * node[:networking][:nameservers]
 
 require "ipaddr"

+require "yaml"

 
 

-network_packages = []
+package "netplan.io"
+
+netplan = {
+  "network" => {
+    "version" => 2,
+    "renderer" => "networkd",
+    "ethernets" => {},
+    "bonds" => {},
+    "vlans" => {}
+  }
+}

 
 node[:networking][:interfaces].each do |name, interface|
   if interface[:interface]
 
 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]
     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]
       node.normal[:networking][:interfaces][name][:zone] = role[:zone]
     end
 
       end
 
       node.normal[:networking][:interfaces][name][:metric] = role[:metric]
       node.normal[:networking][:interfaces][name][:zone] = role[:zone]
     end
 

-    prefix = node[:networking][:interfaces][name][:prefix]
+    if interface[:address]
+      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)
+    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}")
+    end
+
+    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

 
 

-    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)
+      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
+
+    if interface[:routes]
+      interface[:routes].each do |to, parameters|
+        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

   else
     node.rm(:networking, :interfaces, name)
   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
+
+file "/etc/netplan/01-netcfg.yaml" do
+  action :delete
+end
+
+file "/etc/netplan/50-cloud-init.yaml" do
+  action :delete
+end

 
 

-template "/etc/network/interfaces" do
-  source "interfaces.erb"
+file "/etc/netplan/99-chef.yaml" do

   owner "root"
   group "root"
   mode 0o644
   owner "root"
   group "root"
   mode 0o644

+  content YAML.dump(netplan)

 end
 
 end
 

-execute "hostname" do
+package "cloud-init" do
+  action :purge
+end
+
+ohai "reload-hostname" do

   action :nothing
   action :nothing

-  command "/bin/hostname -F /etc/hostname"
+  plugin "hostname"
+end
+
+execute "hostnamectl-set-hostname" do
+  command "hostnamectl set-hostname #{node[:networking][:hostname]}"
+  notifies :reload, "ohai[reload-hostname]"
+  not_if { ENV.key?("TEST_KITCHEN") || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }

 end
 
 end
 

-template "/etc/hostname" do
-  source "hostname.erb"
+template "/etc/hosts" do
+  source "hosts.erb"

   owner "root"
   group "root"
   mode 0o644
   owner "root"
   group "root"
   mode 0o644

-  notifies :run, "execute[hostname]"
+  not_if { ENV["TEST_KITCHEN"] }

 end
 
 end
 

-template "/etc/hosts" do
-  source "hosts.erb"
+service "systemd-resolved" do
+  action [:enable, :start]
+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
   owner "root"
   group "root"
   mode 0o644

+  notifies :restart, "service[systemd-resolved]", :immediately

 end
 
 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") }
+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

+end

 
 

-  template "/etc/resolv.conf" do
-    source "resolv.conf.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-  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|
 end
 
 node.interfaces(:role => :internal) do |interface|


@@ -99,7 +246,7 @@ node.interfaces(:role => :internal) do |interface|
       next unless gateway[:openvpn]
 
       gateway[:openvpn][:tunnels].each_value do |tunnel|
       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]
           route tunnel[:peer][:address] do
             netmask "255.255.255.255"
             gateway interface[:gateway]


@@ -185,6 +332,7 @@ template "/etc/shorewall/conntrack" do
   group "root"
   mode 0o644
   notifies :restart, "service[shorewall]"
   group "root"
   mode 0o644
   notifies :restart, "service[shorewall]"

+  only_if { node[:networking][:firewall][:raw] }

 end
 
 template "/etc/shorewall/policy" do
 end
 
 template "/etc/shorewall/policy" do


@@ -305,6 +453,7 @@ unless node.interfaces(:family => :inet6).empty?
     group "root"
     mode 0o644
     notifies :restart, "service[shorewall6]"
     group "root"
     mode 0o644
     notifies :restart, "service[shorewall6]"

+    only_if { node[:networking][:firewall][:raw] }

   end
 
   template "/etc/shorewall6/policy" do
   end
 
   template "/etc/shorewall6/policy" do