saltstack-formulas/openssh-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(jinja): omit_ip_address don't work on some platform

Browse Source 
It apprears that the

  `if not (omit_ip_address is sameas true or host in omit_ip_address)`

always returns `True` on older Jinja platforms:

- default-ubuntu-1604-3000-3-py2
- default-ubuntu-1604-2019-2-py3
- default-amazonlinux-1-2019-2-py2

Each part of the `or` conditional need to be surrounded by parenthesis.
This commit is contained in:
Daniel Dehennin 2020-07-30 12:25:34 +02:00
parent 156a8a2cd8
commit b2d38aec9b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openssh/files/default/ssh_known_hosts
View File

@ -6,7 +6,7 @@
{%- macro known_host_entry(host, host_names, keys, include_localhost, omit_ip_address) %} {%- macro known_host_entry(host, host_names, keys, include_localhost, omit_ip_address) %}
{#- Get IPv4 and IPv6 addresses from the DNS #} {#- Get IPv4 and IPv6 addresses from the DNS #}
{%- if not (omit_ip_address is sameas true or host in omit_ip_address) %} {%- if not ((omit_ip_address is sameas true) or (host in omit_ip_address)) %}
{%- set ip4 = salt['dig.A'](host) -%} {%- set ip4 = salt['dig.A'](host) -%}
{%- set ip6 = salt['dig.AAAA'](host) -%} {%- set ip6 = salt['dig.AAAA'](host) -%}
{%- else %} {%- else %}