ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 21:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

added handlers_from (#49220)

Browse source 
* added handlers_from

fixes #46769
This commit is contained in:
Brian Coca 2018-12-18 11:28:24 -05:00 • committed by GitHub
commit 88c87a3583
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 72 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/role/__init__.py
View file

@ -230,7 +230,7 @@ class Role(Base, Become, Conditional, Taggable):
raise AnsibleParserError("The tasks/main.yml file for role '%s' must contain a list of tasks" % self._role_name,
obj=task_data, orig_exc=e)
handler_data = self._load_role_yaml('handlers')
handler_data = self._load_role_yaml('handlers', main=self._from_files.get('handlers'))
if handler_data:
try:
self._handler_blocks = load_list_of_blocks(handler_data, play=self._play, role=self, use_handlers=True, loader=self._loader,

2
lib/ansible/playbook/role_include.py
View file

@ -41,7 +41,7 @@ class IncludeRole(TaskInclude):
"""
BASE = ('name', 'role') # directly assigned
FROM_ARGS = ('tasks_from', 'vars_from', 'defaults_from') # used to populate from dict in role
FROM_ARGS = ('tasks_from', 'vars_from', 'defaults_from', 'handlers_from') # used to populate from dict in role
OTHER_ARGS = ('apply', 'public', 'allow_duplicates') # assigned to matching property
VALID_ARGS = tuple(frozenset(BASE + FROM_ARGS + OTHER_ARGS)) # all valid args