From 376b199c0540e39189bdf6b31b9a60eadffa3989 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 23 Oct 2018 11:08:48 -0500 Subject: [stable-2.7] Ensure we don't overwrite roles from include/import_role when loading the play (#47512) * Ensure we don't overwrite roles from include/import_role when loading the play. Fixes #47454 * Add changelog fragment (cherry picked from commit d5e4f37) Co-authored-by: Matt Martz --- lib/ansible/playbook/play.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/ansible/playbook') diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 370a77f4df..2469122ca1 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -195,7 +195,12 @@ class Play(Base, Taggable, Become): roles = [] for ri in role_includes: roles.append(Role.load(ri, play=self)) - return roles + + return self._extend_value( + self.roles, + roles, + prepend=True + ) def _load_vars_prompt(self, attr, ds): new_ds = preprocess_vars(ds) -- cgit v1.2.1