From dd0bfa936d0dfe62cc12ef3268ef99d96103a381 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 4 Mar 2023 15:47:15 +0000
Subject: [PATCH] Switch all machines at UCL to use nftables

---
 roles/noquiklos.rb | 3 ---
 roles/ucl.rb       | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index e7078609f..4fd452acd 100644
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -6,9 +6,6 @@ default_attributes(
     :memory_limit => 24 * 1024
   },
   :networking => {
-    :firewall => {
-      :engine => "nftables"
-    },
     :interfaces => {
       :internal_ipv4 => {
         :interface => "eth0.2801",
diff --git a/roles/ucl.rb b/roles/ucl.rb
index 516c925d3..1bfa54c20 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -4,6 +4,9 @@ description "Role applied to all servers at UCL"
 default_attributes(
   :location => "Slough, England",
   :networking => {
+    :firewall => {
+      :engine => "nftables"
+    },
     :roles => {
       :internal => {
         :inet => {
-- 
2.39.5