LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity

Listeners macro: skip on empty mine
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details

Browse Source 
Don't fail if mine does not contain information about the queried
minion.
In the future it would be nice to add another conditional to allow such
minions to fall-back to the locally executed network module for
masterless setups.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
Georg Pfuetzenreuter 2023-01-28 01:52:07 +01:00
parent bd166cbb42
commit bd7fe25eb0
Signed by: Georg
GPG Key ID: 1ED2F138E7E6FF57
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pillar/global/macros.jinja
View File

@ -2,16 +2,18 @@
{%- set listen_ips = [] -%} {%- set listen_ips = [] -%}
{%- set minion = grains['id'] -%} {%- set minion = grains['id'] -%}
{%- set legal6s = ('fd29', '2a01:4f8:11e:2200') -%} {%- set legal6s = ('fd29', '2a01:4f8:11e:2200') -%}
{%- for ip in salt.saltutil.runner('mine.get', tgt=minion, fun='network.ip_addrs', tgt_type='glob')[minion] -%} {%- set ip4s = salt.saltutil.runner('mine.get', tgt=minion, fun='network.ip_addrs', tgt_type='glob') -%}
{%- set ip6s = salt.saltutil.runner('mine.get', tgt=minion, fun='network.ip_addrs6', tgt_type='glob') -%}
{%- if minion in ip4s -%}{%- for ip in ip4s[minion] -%}
{%- if salt['network.is_private'](ip) -%} {%- if salt['network.is_private'](ip) -%}
{%- do listen_ips.append(ip) -%} {%- do listen_ips.append(ip) -%}
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}{%- endif -%}
{%- for ip in salt.saltutil.runner('mine.get', tgt=minion, fun='network.ip_addrs6', tgt_type='glob')[minion] -%} {%- if minion in ip6s -%}{%- for ip in ip6s[minion] -%}
{%- if ip.startswith(legal6s) -%} {%- if ip.startswith(legal6s) -%}
{%- do listen_ips.append(ip) -%} {%- do listen_ips.append(ip) -%}
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}{%- endif -%}
{%- for ip in listen_ips %} {%- for ip in listen_ips %}
- {{ ip }} - {{ ip }}
{%- endfor %} {%- endfor %}