From beb8df4e22cdf7a8d3016186ec333838eaa1c3c2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 5 Mar 2023 12:21:34 +0000 Subject: [PATCH] Switch remaining servers to nftables --- cookbooks/networking/attributes/default.rb | 2 +- roles/equinix-ams.rb | 3 --- roles/equinix-dub.rb | 3 --- roles/ucl.rb | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb index 84ccd170d..eb4ffbc40 100644 --- 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] = [] diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb index 13ab23878..19b106de3 100644 --- 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 => { - :firewall => { - :engine => "nftables" - }, :roles => { :internal => { :inet => { diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb index 94a8989e1..c4f30e2ff 100644 --- a/roles/equinix-dub.rb +++ b/roles/equinix-dub.rb @@ -12,9 +12,6 @@ default_attributes( } }, :networking => { - :firewall => { - :engine => "nftables" - }, :roles => { :internal => { :inet => { diff --git a/roles/ucl.rb b/roles/ucl.rb index 1bfa54c20..516c925d3 100644 --- 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 => { - :firewall => { - :engine => "nftables" - }, :roles => { :internal => { :inet => { -- 2.39.5