cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing bug related to dynamic includes + with* loops

Browse source
This commit is contained in:
James Cammarata 2015-03-04 13:26:17 -06:00
parent d0cfcdbc4d
commit ca4c5a14bb
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
v2/ansible/plugins/strategies/linear.py
View file

@ -209,6 +209,7 @@ class StrategyModule(StrategyBase):
results = self._wait_on_pending_results(iterator) results = self._wait_on_pending_results(iterator)
host_results.extend(results) host_results.extend(results)
# FIXME: this needs to be somewhere else
class IncludedFile: class IncludedFile:
def __init__(self, filename, args, task): def __init__(self, filename, args, task):
self._filename = filename self._filename = filename
@ -239,6 +240,8 @@ class StrategyModule(StrategyBase):
include_file = self._loader.path_dwim(res._task.args.get('_raw_params')) include_file = self._loader.path_dwim(res._task.args.get('_raw_params'))
include_variables = include_result.get('include_variables', dict()) include_variables = include_result.get('include_variables', dict())
if 'item' in include_result:
include_variables['item'] = include_result['item']
inc_file = IncludedFile(include_file, include_variables, original_task) inc_file = IncludedFile(include_file, include_variables, original_task)

4
v2/samples/test_include.yml
View file

@ -20,6 +20,6 @@
- include: include.yml a=always - include: include.yml a=always
handlers: handlers:
- name: foo #- name: foo
include: include.yml a="this is a handler" # include: include.yml a="this is a handler"