From bd772df0ebd836bb5125cc61f513d1f0eb07f9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Tue, 21 Jun 2022 13:27:47 +0200 Subject: [PATCH] Allow CI to switch the firewall engine In order to properly test nftables in the different scenarios, we want to be able to switch the engine. Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/841445 Change-Id: I136c0d40b8088779a5fbc3570e1f136a88ec41e3 --- .../templates/undercloud-parameter-defaults.yaml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2 b/roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2 index e479c3e64..f64ec2efd 100644 --- a/roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2 +++ b/roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2 @@ -24,4 +24,8 @@ resulting YAML is consumed, whereas with JSON all strings are quoted. {% endif %} {% set _ = undercloud_parameter_defaults['parameter_defaults'].update({'MasqueradeNetworks': masquerade_nets }) %} {% endif %} +{# TODO(cjeanner) remove this block once nftables is default #} +{% if undercloud_firewall_engine is defined %} +{% set _ = undercloud_parameter_defaults['parameter_defaults'].update({'FirewallEngine': undercloud_firewall_engine}) %} +{% endif %} {{ undercloud_parameter_defaults | to_nice_json }}