Compile salt grains from grains.d directory

salt/master/minion.sls

@@ -18,7 +18,6 @@ include:
   file.symlink:
   - target: /srv/salt/minion_keys
   - require:
-    - file: /srv/salt/env/{{ name }}
     - file: /srv/salt/minion_keys
 
 {%- endfor %}
@@ -43,4 +42,4 @@ copy_generated_key_{{ minion.name }}:
 
 {%- endif %}
 
-{%- endif %}
+{%- endif %}

salt/minion.sls

@@ -7,11 +7,17 @@ salt_minion_packages:
 
 salt_minion_grains_dir:
   file.directory:
-  - name: /var/lib/salt/grains
+  - name: /etc/salt/grains.d
   - mode: 700
   - makedirs: true
   - user: root
 
+salt_minion_grains_file:
+  cmd.run:
+  - name: cat /etc/salt/grains.d/* > /etc/salt/grains
+  - require:
+    - file: salt_minion_grains_dir
+
 /etc/salt/minion.d/minion.conf:
   file.managed:
   - source: salt://salt/files/minion.conf