Add optional support for generating netplan configuration

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 862295b0bc7acca44ab6e192a70005c8ceabfe23..44513eab3d1a0edda9c5c5f28aa98ef04c3ee55a 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -15,6 +15,9 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 363
 
+Metrics/BlockNesting:
+  Max: 4
+
 # Offense count: 3
 Metrics/CyclomaticComplexity:
   Max: 8

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index f7db87730f14ded5b8d719defc7f30957d654a12..b383c450ea800321ea6feb733b53728e427ac364 100644 (file)
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -9,3 +9,4 @@ default[:networking][:firewall][:mangle] = true
 default[:networking][:interfaces] = {}
 default[:networking][:nameservers] = []
 default[:networking][:search] = []
+default[:networking][:netplan] = false

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index c45daae3fca5e4af0c6cf0596936e6213d43c148..e89064d6821d116b1f65d6b33bdd123627e4691f 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -21,9 +21,20 @@
 # * node[:networking][:nameservers]
 
 require "ipaddr"
+require "yaml"
 
 network_packages = []
 
+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+$/
@@ -43,18 +54,105 @@ 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]
+      if interface[:interface] =~ /^(.*)\.(\d+)$/
+        deviceplan = netplan["network"]["vlans"][interface[:interface]] = {
+          "id" => Regexp.last_match(2).to_i,
+          "link" => Regexp.last_match(1),
+          "accept-ra" => false,
+          "addresses" => [],
+          "routes" => []
+        }
+      elsif interface[:bond]
+        deviceplan = netplan["network"]["bonds"][interface[:interface]] = {
+          "accept-ra" => false,
+          "addresses" => [],
+          "routes" => [],
+          "interfaces" => interface[:bond][:slaves],
+          "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["transmit-hash-policy"] = interface[:bond][:xmithashpolicy] if interface[:bond][:xmithashpolicy]
+        deviceplan["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
+      else
+        deviceplan = netplan["network"]["ethernets"][interface[:interface]] = {
+          "accept-ra" => false,
+          "addresses" => [],
+          "routes" => []
+        }
+      end
+
+      deviceplan["addresses"].push("#{interface[:address]}/#{prefix}")
+
+      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
+        )
+      end
+    end
   else
     node.rm(:networking, :interfaces, name)
   end
 end
 
-package network_packages
+if node[:networking][:netplan]
+  package "netplan.io"
 
-template "/etc/network/interfaces" do
-  source "interfaces.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+  file "/etc/netplan/01-netcfg.yaml" do
+    action :delete
+  end
+
+  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|
+    netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false }
+  end
+
+  file "/etc/netplan/99-chef.yaml" do
+    owner "root"
+    group "root"
+    mode 0o644
+    content YAML.dump(netplan)
+  end
+
+  service "networking" do
+    action :disable
+  end
+
+  file "/etc/network/interfaces" do
+    action :delete
+  end
+
+  package "ifupdown" do
+    action :purge
+  end
+else
+  package network_packages
+
+  template "/etc/network/interfaces" do
+    source "interfaces.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+  end
 end
 
 execute "hostname" do

diff --git a/cookbooks/networking/templates/default/interfaces.erb b/cookbooks/networking/templates/default/interfaces.erb
index d0d4dd7c8099628398177aac41ad01e2c25b0f62..1e547b38bff5cc57e25b1e03b276cd348f866d26 100644 (file)
--- a/cookbooks/networking/templates/default/interfaces.erb
+++ b/cookbooks/networking/templates/default/interfaces.erb
@@ -37,9 +37,6 @@ iface <%= interface[:interface] %> <%= interface[:family] %> static
       pre-down /sbin/ip -f <%= interface[:family] %> route del <%= interface[:gateway] %> dev <%= interface[:interface] %>
 <% end -%>
 <% end -%>
-<% if interface[:mtu] -%>
-      mtu <%= interface[:mtu] %>
-<% end -%>
 <% if interface[:family] == "inet6" -%>
       autoconf 0
 <% end -%>