Switch remaining servers to nftables

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index 84ccd170d87801c76b4c061f3a50c9706beb4533..eb4ffbc404c022a1321648acd0d7b5ff982de79f 100644 (file)
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:networking][:firewall][:engine] = "shorewall"
+default[:networking][:firewall][:engine] = "nftables"

 default[:networking][:firewall][:enabled] = true
 default[:networking][:firewall][:inet] = []
 default[:networking][:firewall][:inet6] = []
 default[:networking][:firewall][:enabled] = true
 default[:networking][:firewall][:inet] = []
 default[:networking][:firewall][:inet6] = []

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

-    :firewall => {
-      :engine => "nftables"
-    },

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

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

-    :firewall => {
-      :engine => "nftables"
-    },

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

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

-    :firewall => {
-      :engine => "nftables"
-    },

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