From 08f23700c94f446c2194a3d0b2b2b2858bc4680c Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Sat, 28 Jan 2023 01:17:46 +0100
Subject: Listeners macro: use mined addresses
The network module run on the Salt master, but the macro should fetch
minion addresses.
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
pillar/global/macros.jinja | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'pillar')
diff --git a/pillar/global/macros.jinja b/pillar/global/macros.jinja
index 3cc8848..90e73e2 100644
--- a/pillar/global/macros.jinja
+++ b/pillar/global/macros.jinja
@@ -1,12 +1,13 @@
{%- macro listeners() -%}
{%- set listen_ips = [] -%}
+{%- set minion = grains['id'] -%}
{%- set legal6s = ('fd29', '2a01:4f8:11e:2200') -%}
-{%- for ip in salt['network.ip_addrs']() -%}
+{%- for ip in salt.saltutil.runner('mine.get', tgt=minion, fun='network.ip_addrs', tgt_type='glob')[minion] -%}
{%- if salt['network.is_private'](ip) -%}
{%- do listen_ips.append(ip) -%}
{%- endif -%}
{%- endfor -%}
-{%- for ip in salt['network.ip_addrs6']() -%}
+{%- for ip in salt.saltutil.runner('mine.get', tgt=minion, fun='network.ip_addrs6', tgt_type='glob')[minion] -%}
{%- if ip.startswith(legal6s) -%}
{%- do listen_ips.append(ip) -%}
{%- endif -%}
--
cgit v1.2.3