Switch all machines at UCL to use nftables

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index e7078609fda16f38beb6300b6b43ca693c7ffc33..4fd452acd46ce19e2b030beaf0ceb2ccbb624c89 100644 (file)
--- 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 516c925d39f5e81073d242ca1d7a88425287596a..1bfa54c201c09383158ef85796f8bb7f98f1d5b5 100644 (file)
--- 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 => {