openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Simplify dport writing, transform port list syntaxe"

This commit is contained in:
Zuul 2022-08-24 22:00:35 +00:00 committed by Gerrit Code Review
parent 4ba2a662f5 1aa608ae47
commit e816c747d8
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tripleo_ansible/roles/tripleo_nftables/templates/dport.j2
View File

@ -1,15 +1,19 @@
{%- set ns = namespace(_dport='') %}
{%- if 'dport' in rule %}
{%- if rule['dport'] is iterable %}
{{ rule.get('proto', false)|ternary('', 'tcp ') }}dport { {{ rule['dport'] |join(',') }} }
{%- else %}
{{ rule.get('proto', false)|ternary('', 'tcp ') }}dport {{ rule['dport'] }}
{%- endif %}
{% if rule['dport'] is iterable -%}
{% set ns._dport = rule['dport'] |join(',') -%}
{% else -%}
{% set ns._dport = rule['dport'] -%}
{% endif -%}
{%- endif %}
{#- This is for legacy things - Really, use dport... #}
{%- if 'port' in rule %}
{%- if rule['port'] is iterable %}
{{ rule.get('proto', false)|ternary('', 'tcp ') }}dport { {{ rule['port'] |join(',') }} }
{%- else %}
{{ rule.get('proto', false)|ternary('', 'tcp ') }}dport {{ rule['port'] }}
{%- endif %}
{% if rule['port'] is iterable -%}
{% set ns._dport = rule['port'] |join(',') -%}
{% else -%}
{% set ns._dport = rule['port'] -%}
{% endif -%}
{%- endif %}
{%- if ns._dport != '' %}
{{ rule.get('proto', false)|ternary('', 'tcp ') }}dport { {{ ns._dport |replace(':', '-') }} }
{%- endif %}