openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Allow CI to switch the firewall engine"

This commit is contained in:
Zuul 2022-06-30 16:02:34 +00:00 committed by Gerrit Code Review
parent 51aeddd85b bd772df0eb
commit 52038e9d77
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2
View File

@ -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 }}