add transparent vault use to other plugins (#16957)

assemble, script and unarchive (copy already had it).
ansible · Aug 4, 2016 · bced871 · bced871
1 parent eb2a3a9
commit bced871
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/ansible/plugins/action/assemble.py b/lib/ansible/plugins/action/assemble.py
@@ -48,7 +48,8 @@ def _assemble_from_fragments(self, src_path, delimiter=None, compiled_regexp=Non
             fragment = "%s/%s" % (src_path, f)
             if not os.path.isfile(fragment) or (ignore_hidden and os.path.basename(fragment).startswith('.')):
                 continue
-            fragment_content = file(fragment).read()
+
+            fragment_content = file(self._loader.get_real_file(fragment)).read()
 
             # always put a newline between fragments if the previous fragment didn't end with a newline.
             if add_newline:

diff --git a/lib/ansible/plugins/action/script.py b/lib/ansible/plugins/action/script.py
@@ -72,7 +72,7 @@ def run(self, tmp=None, task_vars=None):
         args   = ' '.join(parts[1:])
 
         try:
-            source = self._find_needle('files', source)
+            source = self._loader.get_real_file(self._find_needle('files', source))
         except AnsibleError as e:
             return dict(failed=True, msg=to_str(e))
 

diff --git a/lib/ansible/plugins/action/unarchive.py b/lib/ansible/plugins/action/unarchive.py
@@ -68,7 +68,7 @@ def run(self, tmp=None, task_vars=None):
 
         if copy:
             try:
-                source = self._find_needle('files', source)
+                source = self._loader.get_real_file(self._find_needle('files', source))
             except AnsibleError as e:
                 result['failed'] = True
                 result['msg'] = to_str(e)