Ensure we don't overwrite roles from include/import_role when loading the play #47512
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sivel
changed the title
|
Hi @sivel, thank you for submitting this pull-request! |
ansibot
added
affects_2.8
webknjaz
removed
the
needs_triage
bcoca
approved these changes
Oct 23, 2018
sivel
added a commit
to sivel/ansible
that referenced
this pull request
Oct 23, 2018
… when loading the play (ansible#47512) * Ensure we don't overwrite roles from include/import_role when loading the play. Fixes ansible#47454 * Add changelog fragment (cherry picked from commit d5e4f37) Co-authored-by: Matt Martz <matt@sivel.net>
Tomorrow9
pushed a commit
to Tomorrow9/ansible
that referenced
this pull request
Dec 4, 2018
… the play (ansible#47512) * Ensure we don't overwrite roles from include/import_role when loading the play. Fixes ansible#47454 * Add changelog fragment
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Ensure we don't overwrite roles from include/import_role when loading the play. Fixes #47454
If a role listed under
rolescallsimport_roleorinclude_role+public=yes, the role from the import/include will be added toplay.roles, but later whenPlay._load_rolescompletes, it will overwrite and remove the registered includes.This brings in logic added to
_load_rolesthat was introduced to fix a similar bug with handlers in 6acdc363174ISSUE TYPE
COMPONENT NAME
lib/ansible/playbook/play.py
ANSIBLE VERSION
ADDITIONAL INFORMATION