commit 9835321d9609bdb9af22ea8138a781bae2be2a75
author Aleš Komárek <github@newt.cz> Tue Oct 18 08:27:39 2016 +0200
committer GitHub <noreply@github.com> Tue Oct 18 08:27:39 2016 +0200
tree a1aa247c6c889816d5540f60ba1f722082cf29e1
parent 0ab17bc3f73fcc38bd9ce231058bef759353b522
parent 28679f6dd0f7b73478e814711b59057305914349

Merge pull request #8 from elemoine/data

Require reclass_data_dir

salt/master/pillar.sls

diff --git a/salt/master/pillar.sls b/salt/master/pillar.sls
index 45dec09..3e2e715 100644
--- a/salt/master/pillar.sls
+++ b/salt/master/pillar.sls
@@ -37,7 +37,9 @@
 - reclass.storage.data
 
 /srv/salt/reclass/classes/service:
-  file.directory
+  file.directory:
+  - require:
+    - file: reclass_data_dir
 
 {%- if master.system is defined %}
 
@@ -47,7 +49,6 @@
   file.symlink:
   - target: /srv/salt/env/{{ master.system.environment }}/{{ formula_name }}/metadata/service
   - require:
-    - git: reclass_data_source
     - file: /srv/salt/reclass/classes/service
 
 {%- endfor %}
@@ -68,7 +69,6 @@
   - target: /usr/share/salt-formulas/env/_formulas/{{ formula_name }}/metadata/service
   {%- endif %}
   - require:
-    - git: reclass_data_source
     - file: /srv/salt/reclass/classes/service
 
 {%- endif %}
@@ -81,4 +81,4 @@
 
 {%- endif %}
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}