From 3572a13b38c044dfb4d7f34f03adf02a74c40004 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 22 Jan 2023 19:20:53 +0100 Subject: [PATCH] Connect syndic minions to syndic master Syndics are generally the masters assigned to their region. We want the minions on syndics to connect to their upstream master ("master of masters") instead of to themselves. Signed-off-by: Georg Pfuetzenreuter --- salt/profile/salt/minion.sls | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls index f55bb97..4b29145 100644 --- a/salt/profile/salt/minion.sls +++ b/salt/profile/salt/minion.sls @@ -1,7 +1,14 @@ +{%- set netbox_pillar = salt['pillar.get']('netbox') -%} +{%- if 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%} +{%- set master = salt['pillar.get']('salt:master:syndic_master') -%} +{%- else -%} +{%- set master = netbox_pillar['config_context']['salt_master'] -%} +{%- endif -%} + /etc/salt/minion.d/master.conf: file.managed: - contents: - - 'master: {{ salt['pillar.get']('netbox:config_context:salt_master') }}' + - 'master: {{ master }}' - require_in: - service: salt-minion - watch_in: