summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-15 17:12:47 +0100
committerGeorg Pfuetzenreuter2023-01-15 17:40:16 +0100
commit546508c7dec218f91edb0c5416716d21a16363a0 (patch)
tree0615c83ed267634b6a69cd866ee3ad658af8bcd4
parentfe2a1a21b9931818807613ca43342719100e78d8 (diff)
downloadsalt-546508c7dec218f91edb0c5416716d21a16363a0.tar.gz
salt-546508c7dec218f91edb0c5416716d21a16363a0.tar.bz2
salt-546508c7dec218f91edb0c5416716d21a16363a0.zip
Use custom minion master configuration
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rw-r--r--pillar/role/salt/minion.sls1
-rw-r--r--salt/profile/salt/minion.sls9
2 files changed, 9 insertions, 1 deletions
diff --git a/pillar/role/salt/minion.sls b/pillar/role/salt/minion.sls
index 0e0fb8a..291ebda 100644
--- a/pillar/role/salt/minion.sls
+++ b/pillar/role/salt/minion.sls
@@ -2,4 +2,3 @@ salt:
minion_remove_config: True
minion:
master_type: str
- master: {{ myconfig['salt_master'] }}
diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls
index 6978eaf..32fb272 100644
--- a/salt/profile/salt/minion.sls
+++ b/salt/profile/salt/minion.sls
@@ -1,3 +1,12 @@
include:
- salt.minion
- .grains
+
+/etc/salt/minion.d/master.conf:
+ file.managed:
+ - contents:
+ - 'master: {{ salt['pillar.get']('netbox:config_context:salt_master') }}'
+ - require_in:
+ - service: salt-minion
+ - watch_in:
+ - service: salt-minion