ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Template handlers late

Browse source 
This allows overriding variables in name, and removes templating from
parsing.
This commit is contained in:
Daniel Hokka Zakrisson 2012-11-23 00:31:38 +01:00
parent ebd31af940
commit 1e0295c7e2
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/playbook/__init__.py
View file

@ -308,13 +308,13 @@ class PlayBook(object):
for host, results in results.get('contacted',{}).iteritems(): for host, results in results.get('contacted',{}).iteritems():
if results.get('changed', False): if results.get('changed', False):
for handler_name in task.notify: for handler_name in task.notify:
self._flag_handler(play.handlers(), utils.template(play.basedir, handler_name, task.module_vars), host) self._flag_handler(play, utils.template(play.basedir, handler_name, task.module_vars), host)
return hosts_remaining return hosts_remaining
# ***************************************************** # *****************************************************
def _flag_handler(self, handlers, handler_name, host): def _flag_handler(self, play, handler_name, host):
''' '''
if a task has any notify elements, flag handlers for run if a task has any notify elements, flag handlers for run
at end of execution cycle for hosts that have indicated at end of execution cycle for hosts that have indicated
@ -322,8 +322,8 @@ class PlayBook(object):
''' '''
found = False found = False
for x in handlers: for x in play.handlers():
if handler_name == x.name: if handler_name == utils.template(play.basedir, x.name, x.module_vars):
found = True found = True
self.callbacks.on_notify(host, x.name) self.callbacks.on_notify(host, x.name)
x.notified_by.append(host) x.notified_by.append(host)

3
lib/ansible/playbook/task.py
View file

@ -149,9 +149,6 @@ class Task(object):
# allow the user to list comma delimited tags # allow the user to list comma delimited tags
import_tags = import_tags.split(",") import_tags = import_tags.split(",")
self.name = utils.template(None, self.name, self.module_vars)
self.action = utils.template(None, self.action, self.module_vars)
# handle mutually incompatible options # handle mutually incompatible options
incompatibles = [ x for x in [ self.first_available_file, self.items_lookup_plugin ] if x is not None ] incompatibles = [ x for x in [ self.first_available_file, self.items_lookup_plugin ] if x is not None ]
if len(incompatibles) > 1: if len(incompatibles) > 1: