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

When using roles, or other includes, the path to DWIM inside is the path of the task include

Browse source 
file.
This commit is contained in:
Michael DeHaan 2013-04-06 18:32:36 -04:00
parent f88d13acf9
commit f044fc344b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/playbooks/roles/foo/handlers/main.yml
View file

@ -3,4 +3,8 @@
- name: blippy - name: blippy
shell: echo notifier called, and the value of x is '{{ x }}' shell: echo notifier called, and the value of x is '{{ x }}'
# within a role, it's possible to include other task files as well. By default, we
# can reference files in the same directory without doing anything special:
- include: other.yml

10
lib/ansible/playbook/play.py
View file

@ -223,9 +223,13 @@ class Play(object):
for t in tokens[1:]: for t in tokens[1:]:
(k,v) = t.split("=", 1) (k,v) = t.split("=", 1)
mv[k] = utils.template(self.basedir, v, mv) mv[k] = utils.template(self.basedir, v, mv)
include_file = utils.template(self.basedir, tokens[0], mv) dirname = self.basedir
data = utils.parse_yaml_from_file(utils.path_dwim(self.basedir, include_file)) if original_file:
results += self._load_tasks(data, mv, included_additional_conditions, original_file=include_file) dirname = os.path.dirname(original_file)
include_file = utils.template(dirname, tokens[0], mv)
include_filename = utils.path_dwim(dirname, include_file)
data = utils.parse_yaml_from_file(include_filename)
results += self._load_tasks(data, mv, included_additional_conditions, original_file=include_filename)
elif type(x) == dict: elif type(x) == dict:
results.append(Task(self,x,module_vars=task_vars, additional_conditions=additional_conditions)) results.append(Task(self,x,module_vars=task_vars, additional_conditions=additional_conditions))
else: else: