a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include_role process name from options, not task

pull/4420/head
Brian Coca 2016-10-03 18:29:29 -04:00
parent 965dcabed2
commit d4b2ea3ec8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/playbook/role_include.py
View File

@ -21,6 +21,7 @@ __metaclass__ = type
from os.path import basename from os.path import basename
from ansible.errors import AnsibleParserError
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.task import Task from ansible.playbook.task import Task
from ansible.playbook.role import Role from ansible.playbook.role import Role
@ -56,6 +57,7 @@ class IncludeRole(Task):
self.statically_loaded = False self.statically_loaded = False
self._from_files = {} self._from_files = {}
self._parent_role = role self._parent_role = role
self._role_name = None
def get_block_list(self, play=None, variable_manager=None, loader=None): def get_block_list(self, play=None, variable_manager=None, loader=None):
@ -66,7 +68,7 @@ class IncludeRole(Task):
else: else:
myplay = play myplay = play
ri = RoleInclude.load(self.name, play=myplay, variable_manager=variable_manager, loader=loader) ri = RoleInclude.load(self._role_name, play=myplay, variable_manager=variable_manager, loader=loader)
ri.vars.update(self.vars) ri.vars.update(self.vars)
# build role # build role
@ -89,6 +91,11 @@ class IncludeRole(Task):
ir = IncludeRole(block, role, task_include=task_include).load_data(data, variable_manager=variable_manager, loader=loader) ir = IncludeRole(block, role, task_include=task_include).load_data(data, variable_manager=variable_manager, loader=loader)
ir._role_name = ir.args.get('name')
if ir._role_name is None:
raise AnsibleParserError("'name' is a required field.")
# set built in's # set built in's
attributes = frozenset(ir._valid_attrs.keys()) attributes = frozenset(ir._valid_attrs.keys())
for builtin in attributes: for builtin in attributes: