Switch remaining machines to use systemd-networkd

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index f143d59f9cffb042cfd476fab514cde9b0fe5a46..fc80cf0198f1bbccdfa7762356cdc89adf25d60b 100644 (file)
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:networking][:engine] = "netplan"
+default[:networking][:engine] = "systemd-networkd"

 default[:networking][:firewall][:enabled] = true
 default[:networking][:firewall][:sets] = []
 default[:networking][:firewall][:helpers] = []
 default[:networking][:firewall][:enabled] = true
 default[:networking][:firewall][:sets] = []
 default[:networking][:firewall][:helpers] = []

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 8ec3f9b38c5d04a22403f9c4636d850201f38025..fafecd478f3d7bf35f679fc745e825f420edde31 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -3,7 +3,6 @@ description "Role applied to all servers at Equinix Amsterdam"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

-    :engine => "systemd-networkd",

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index fde95a21abfb1e748a0dd3f79ac9c68c277653f3..c4f30e2ff90ffe4d4433d3ac89a61b1f2744c9ef 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -12,7 +12,6 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :engine => "systemd-networkd",

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {

diff --git a/roles/ucl.rb b/roles/ucl.rb
index befd4f911e62ad035fab4bfdc76a9685d3359262..516c925d39f5e81073d242ca1d7a88425287596a 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -4,7 +4,6 @@ description "Role applied to all servers at UCL"
 default_attributes(
   :location => "Slough, England",
   :networking => {
 default_attributes(
   :location => "Slough, England",
   :networking => {

-    :engine => "systemd-networkd",

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {