wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add transparent vault use to other plugins (#16957)

Browse source 
assemble, script and unarchive (copy already had it).
This commit is contained in:
Brian Coca 2016-08-04 18:35:30 -04:00 committed by GitHub
parent eb2a3a91a8
commit bced8715cd
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/plugins/action/assemble.py
View file

@ -48,7 +48,8 @@ class ActionModule(ActionBase):
fragment = "%s/%s" % (src_path, f) fragment = "%s/%s" % (src_path, f)
if not os.path.isfile(fragment) or (ignore_hidden and os.path.basename(fragment).startswith('.')): if not os.path.isfile(fragment) or (ignore_hidden and os.path.basename(fragment).startswith('.')):
continue 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. # always put a newline between fragments if the previous fragment didn't end with a newline.
if add_newline: if add_newline:

2
lib/ansible/plugins/action/script.py
View file

@ -72,7 +72,7 @@ class ActionModule(ActionBase):
args = ' '.join(parts[1:]) args = ' '.join(parts[1:])
try: try:
source = self._find_needle('files', source) source = self._loader.get_real_file(self._find_needle('files', source))
except AnsibleError as e: except AnsibleError as e:
return dict(failed=True, msg=to_str(e)) return dict(failed=True, msg=to_str(e))

2
lib/ansible/plugins/action/unarchive.py
View file

@ -68,7 +68,7 @@ class ActionModule(ActionBase):
if copy: if copy:
try: try:
source = self._find_needle('files', source) source = self._loader.get_real_file(self._find_needle('files', source))
except AnsibleError as e: except AnsibleError as e:
result['failed'] = True result['failed'] = True
result['msg'] = to_str(e) result['msg'] = to_str(e)