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

Allow 'when' and 'with_items' to be applied to roles.

Browse source
This commit is contained in:
Michael DeHaan 2013-04-12 19:02:56 -04:00
parent 7a2d493e67
commit 3ab0ed5fd4
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,5 +6,5 @@
# within a role, it's possible to include other task files as well. By default, we # 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: # can reference files in the same directory without doing anything special:
- include: other.yml # - include: other.yml

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

@ -140,6 +140,9 @@ class Play(object):
has_dict = orig_path has_dict = orig_path
orig_path = role_name orig_path = role_name
with_items = has_dict.get('with_items', None)
when = has_dict.get('when', None)
path = utils.path_dwim(self.basedir, orig_path) path = utils.path_dwim(self.basedir, orig_path)
if not os.path.isdir(path) and not orig_path.startswith(".") and not orig_path.startswith("/"): if not os.path.isdir(path) and not orig_path.startswith(".") and not orig_path.startswith("/"):
path2 = utils.path_dwim(self.basedir, os.path.join('roles', orig_path)) path2 = utils.path_dwim(self.basedir, os.path.join('roles', orig_path))
@ -152,9 +155,19 @@ class Play(object):
handler = utils.path_dwim(self.basedir, os.path.join(path, 'handlers', 'main.yml')) handler = utils.path_dwim(self.basedir, os.path.join(path, 'handlers', 'main.yml'))
vars_file = utils.path_dwim(self.basedir, os.path.join(path, 'vars', 'main.yml')) vars_file = utils.path_dwim(self.basedir, os.path.join(path, 'vars', 'main.yml'))
if os.path.isfile(task): if os.path.isfile(task):
new_tasks.append(dict(include=task, vars=has_dict)) nt = dict(include=task, vars=has_dict)
if when:
nt['when'] = when
if with_items:
nt['with_items'] = with_items
new_tasks.append(nt)
if os.path.isfile(handler): if os.path.isfile(handler):
new_handlers.append(dict(include=handler, vars=has_dict)) nt = dict(include=handler, vars=has_dict)
if when:
nt['when'] = when
if with_items:
nt['with_items'] = with_items
new_handlers.append(nt)
if os.path.isfile(vars_file): if os.path.isfile(vars_file):
new_vars_files.append(vars_file) new_vars_files.append(vars_file)