From 2a2b7dc42a9ee44bc737e6fdf06d628bf4bf296a Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 7 Mar 2022 12:09:06 -0800 Subject: [PATCH] Update include role to match the base class. Use frozenset instead of tuple. --- lib/ansible/playbook/role_include.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/playbook/role_include.py b/lib/ansible/playbook/role_include.py index 2da3186c5cd..c1cc2229ba3 100644 --- a/lib/ansible/playbook/role_include.py +++ b/lib/ansible/playbook/role_include.py @@ -43,10 +43,10 @@ class IncludeRole(TaskInclude): circumstances related to the `- include_role: ...` """ - BASE = ('name', 'role') # type: tuple[str, ...] # directly assigned - FROM_ARGS = ('tasks_from', 'vars_from', 'defaults_from', 'handlers_from') # type: tuple[str, ...] # used to populate from dict in role - OTHER_ARGS = ('apply', 'public', 'allow_duplicates', 'rolespec_validate') # type: tuple[str, ...] # assigned to matching property - VALID_ARGS = tuple(frozenset(BASE + FROM_ARGS + OTHER_ARGS)) # all valid args + BASE = frozenset(('name', 'role')) # directly assigned + FROM_ARGS = frozenset(('tasks_from', 'vars_from', 'defaults_from', 'handlers_from')) # used to populate from dict in role + OTHER_ARGS = frozenset(('apply', 'public', 'allow_duplicates', 'rolespec_validate')) # assigned to matching property + VALID_ARGS = BASE | FROM_ARGS | OTHER_ARGS # all valid args # ================================================================================= # ATTRIBUTES