From eb1731e7a11bfc94f7a02a43b8e5db262660f03d Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 15 Jan 2023 15:53:39 +0100 Subject: Move managed grains to minion pillar Signed-off-by: Georg Pfuetzenreuter --- pillar/role/salt/minion.sls | 8 +++++++- salt/role/salt/minion.sls | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pillar/role/salt/minion.sls b/pillar/role/salt/minion.sls index f67ec63..9b1c850 100644 --- a/pillar/role/salt/minion.sls +++ b/pillar/role/salt/minion.sls @@ -1,5 +1,11 @@ +{%- set myconfig = pillar['netbox']['config_context'] -%} + salt: minion_remove_config: True minion: master_type: str - master: {{ pillar['netbox']['config_context']['salt_master'] }} + master: {{ myconfig['salt_master'] }} + {%- if 'roles' in myconfig and myconfig['roles'] | length > 0 %} + grains: + roles: {{ myconfig['roles'] }} + {%- endif %} diff --git a/salt/role/salt/minion.sls b/salt/role/salt/minion.sls index dceff40..f65fa18 100644 --- a/salt/role/salt/minion.sls +++ b/salt/role/salt/minion.sls @@ -1,3 +1,2 @@ include: - - profile.salt.grains - salt.minion -- cgit v1.2.3