Remove bytemark credentials from DNS scripts

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 6459a7e9dc91b840d0b07fec04980e79e10e1cb1..89e8198e223ba0545b479afaa87d50ec440666d6 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
 #
-# 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,6 +23,8 @@
 require "ipaddr"
 require "yaml"
 
+package "netplan.io"
+
 netplan = {
   "network" => {
     "version" => 2,
@@ -39,6 +41,7 @@ node[:networking][:interfaces].each do |name, interface|
       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]
@@ -50,6 +53,8 @@ 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,
@@ -74,6 +79,10 @@ node[:networking][:interfaces].each do |name, interface|
 
     deviceplan["addresses"].push("#{interface[:address]}/#{prefix}")
 
+    if interface[:mtu]
+      deviceplan["mtu"] = interface[:mtu]
+    end
+
     if interface[:bond]
       deviceplan["interfaces"] = interface[:bond][:slaves].to_a
 
@@ -118,6 +127,20 @@ node[:networking][:interfaces].each do |name, interface|
         )
       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
@@ -172,55 +195,47 @@ template "/etc/hosts" do
   owner "root"
   group "root"
   mode 0o644
+  not_if { ENV["TEST_KITCHEN"] }
 end
 
-if node[:networking][:resolved]
-  service "systemd-resolved" do
-    action [:enable, :start]
-  end
+service "systemd-resolved" do
+  action [:enable, :start]
+end
 
-  directory "/etc/systemd/resolved.conf.d" do
-    owner "root"
-    group "root"
-    mode 0o755
-  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
+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
 
-  file "/etc/resolv.conf" do
-    action :delete
-    not_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
 
-  link "/etc/resolv.conf" do
-    to "../run/systemd/resolve/stub-resolv.conf"
-  end
+link "/etc/resolv.conf" do
+  to "../run/systemd/resolve/stub-resolv.conf"
+end
 
-  package "resolvconf" do
-    action :purge
-  end
-else
-  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
+if node[:networking][:tcp_fastopen_key]
+  fastopen_keys = data_bag_item("networking", "fastopen")
 
-    template "/etc/resolv.conf" do
-      source "resolv.conf.erb"
-      owner "root"
-      group "root"
-      mode 0o644
-    end
-  end
+  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|
@@ -229,7 +244,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]