Merge pull request saltstack-formulas#2 from evvers/master

Add map.jinja
thomaslarsen · Feb 16, 2014 · 9bd1004 · 9bd1004
2 parents c0fec43 + 5c18009
commit 9bd1004
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/template/init.sls b/template/init.sls
@@ -1,12 +1,10 @@
-foo-common:
-  pkg.installed
+{% from "template/map.jinja" import template with context %}
 
-{% if grains['id'] == pillar['template']['master'] %}
-foo-service:
+template:
   pkg:
     - installed
+    - name: {{ template.pkg }}
   service:
     - running
+    - name: {{ template.service }}
     - enable: True
-
-{% endif %}
diff --git a/template/map.jinja b/template/map.jinja
@@ -0,0 +1,7 @@
+{% set template = salt['grains.filter_by']({
+    'default': {
+        'pkg': 'template',
+        'service': 'template',
+        'config': '/etc/template.conf',
+    },
+}, merge=salt['pillar.get']('template:lookup')) %}