Move managed grains to minion pillar

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-01-15 15:53:39 +01:00 · 2023-01-15 15:53:39 +01:00 · eb1731e7a1
commit eb1731e7a1
parent 11620c863c
2 changed files with 7 additions and 2 deletions
--- 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 %}
--- a/salt/role/salt/minion.sls
+++ b/salt/role/salt/minion.sls
@ -1,3 +1,2 @@
 include:
-  - profile.salt.grains
  - salt.minion