Merge "Introduce template option for linux.system.file"

.kitchen.yml

@@ -63,4 +63,12 @@ suites:
       pillars-from-files:
         linux.sls: tests/pillar/system.sls
 
+  - name: system_file
+    provisioner:
+      pillars-from-files:
+        linux.sls: tests/pillar/system_file.sls
+      pillars_from_directories:
+        - source: tests/example
+          dest: srv/salt/linux/files/test
+
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125

README.rst

@@ -467,6 +467,14 @@ Ensure presence of file by specifying its source:
             name: /tmp/test.txt
             source: http://example.com/test.txt
 
+    linux:
+      system:
+        file:
+          test2:
+            name: /tmp/test2.txt
+            source: http://example.com/test2.jinja
+            template: jinja
+
 Ensure presence of file by specifying its contents:
 
 .. code-block:: yaml

linux/system/file.sls

@@ -21,6 +21,9 @@ linux_file_{{ file_name }}:
     {%- else %}
     - skip_verify: True
     {%- endif %}
+    {%- if file.template is defined %}
+    - template: {{ file.template }}
+    {%- endif %}
     {%- elif file.contents is defined %}
     - contents: {{ file.contents|yaml }}
     {%- elif file.contents_pillar is defined %}
@@ -28,6 +31,7 @@ linux_file_{{ file_name }}:
     {%- elif file.contents_grains is defined %}
     - contents_grains: {{ file.contents_grains }}
     {%- endif %}
+
 {%- endif %}
     {%- if file.name is defined %}
     - name: {{ file.name }}

tests/example/file_template.jinja

@@ -0,0 +1 @@
+foo{{ pillar["test"]["example"] }}

tests/pillar/system_file.sls

@@ -23,4 +23,10 @@ linux:
         mode: 700
         dir_mode: 700
         encoding: utf-8
-        makedirs: true
+        makedirs: true
+      test3:
+        name: /tmp/test3.txt
+        source: salt://linux/files/test/file_template.jinja
+        template: jinja
+test:
+  example: "bar"