Eliminate need for dummy addresses in when running under test

[chef.git] / cookbooks / networking / templates / default / nftables.conf.erb

diff --git a/cookbooks/networking/templates/default/nftables.conf.erb b/cookbooks/networking/templates/default/nftables.conf.erb
index cd48c0b7f039b28f118fe650faadd3f4d1fcd3a1..65d090db31d3cd6ed2b19b3ded337c516402e745 100644 (file)
--- a/cookbooks/networking/templates/default/nftables.conf.erb
+++ b/cookbooks/networking/templates/default/nftables.conf.erb
@@ -5,12 +5,23 @@ define external-interfaces = { <%= @interfaces.sort.uniq.join(", ") %> }
 define ip-private-addresses = { 10.0.0.0/8, 127.0.0.0/8, 169.254.0.0/16, 172.16.0.0/12, 192.0.2.0/24, 192.168.0.0/16 }
 define ip6-private-addresses = { 2001:db8::/32, fc00::/7 }
 
-define ip-osm-addresses = { <%= Array(@hosts[:inet]).sort.join(", ") %> }
-define ip6-osm-addresses = { <%= Array(@hosts[:inet6]).sort.join(", ") %> }
-
 flush ruleset
 
 table inet filter {
+  set ip-osm-addresses {
+    type ipv4_addr
+<%- unless Array(@hosts["inet"]).empty? %>
+    elements = { <%= Array(@hosts["inet"]).sort.join(", ") %> }
+<%- end %>
+  }
+
+  set ip6-osm-addresses {
+    type ipv6_addr
+<%- unless Array(@hosts["inet"]).empty? %>
+    elements = { <%= Array(@hosts["inet6"]).sort.join(", ") %> }
+<%- end %>
+  }
+
   set ip-blacklist {
     type ipv4_addr
     flags dynamic