Use traditional grains management

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

pillar/role/salt/minion.sls

@@ -1,11 +1,5 @@
-{%- set myconfig = pillar['netbox']['config_context'] -%}
-
 salt:
   minion_remove_config: True
   minion:
     master_type: str
     master: {{ myconfig['salt_master'] }}
-    {%- if 'roles' in myconfig and myconfig['roles'] | length > 0 %}
-    grains:
-      roles: {{ myconfig['roles'] }}
-    {%- endif %}

salt/profile/salt/grains.sls

@@ -6,10 +6,7 @@ salt_grains_file:
     - names:
       - /etc/salt/grains:
         - source: salt:///{{ slspath }}/files/etc/salt/grains.j2
-
+    - require_in:
-salt_restart_minion:
+      - service: salt-minion
-  cmd.run:
+    - watch_in:
-    - name: 'salt-call service.restart salt-minion'
+      - service: salt-minion
-    - bg: True
-    - onchanges:
-      - file: salt_grains_file

salt/profile/salt/minion.sls

@@ -0,0 +1,3 @@
+include:
+  - salt.minion
+  - .grains

salt/role/salt/minion.sls

@@ -1,2 +1,2 @@
 include:
-  - salt.minion
+  - profile.salt.minion