ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Partial revert of 73c883c due to issues with handlers in roles

Browse source 
Fixes #6322
This commit is contained in:
James Cammarata 2014-03-06 21:11:57 -06:00
parent e486dbab04
commit b6056044b7
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,7 +6,6 @@ Ansible Changes By Release
Major features/changes: Major features/changes:
* The deprecated legacy variable templating system has been finally removed. Use {{ foo }} always not $foo or ${foo}. * The deprecated legacy variable templating system has been finally removed. Use {{ foo }} always not $foo or ${foo}.
* Role dependencies are now tracked across multiple plays, making common roles easier to include in dependencies without any special variable tricks.
* Any data file can also be JSON. Use sparingly -- with great power comes great responsibility. Starting file with "{" or "[" denotes JSON. * Any data file can also be JSON. Use sparingly -- with great power comes great responsibility. Starting file with "{" or "[" denotes JSON.
New Modules: New Modules:

9
lib/ansible/playbook/__init__.py
View file

@ -240,20 +240,13 @@ class PlayBook(object):
plays = [] plays = []
matched_tags_all = set() matched_tags_all = set()
unmatched_tags_all = set() unmatched_tags_all = set()
included_roles = []
# loop through all patterns and run them # loop through all patterns and run them
self.callbacks.on_start() self.callbacks.on_start()
for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs): for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs):
play = Play(self, play_ds, play_basedir, included_roles=included_roles, vault_password=self.vault_password) play = Play(self, play_ds, play_basedir, vault_password=self.vault_password)
assert play is not None assert play is not None
# add any new roles brought in by this play to the
# global list of roles we're tracking
for role in play.included_roles:
if role not in included_roles:
included_roles.append(role)
matched_tags, unmatched_tags = play.compare_tags(self.only_tags) matched_tags, unmatched_tags = play.compare_tags(self.only_tags)
matched_tags_all = matched_tags_all | matched_tags matched_tags_all = matched_tags_all | matched_tags
unmatched_tags_all = unmatched_tags_all | unmatched_tags unmatched_tags_all = unmatched_tags_all | unmatched_tags

4
lib/ansible/playbook/play.py
View file

@ -49,7 +49,7 @@ class Play(object):
# ************************************************* # *************************************************
def __init__(self, playbook, ds, basedir, included_roles=[], vault_password=None): def __init__(self, playbook, ds, basedir, vault_password=None):
''' constructor loads from a play datastructure ''' ''' constructor loads from a play datastructure '''
for x in ds.keys(): for x in ds.keys():
@ -81,7 +81,7 @@ class Play(object):
self._update_vars_files_for_host(None) self._update_vars_files_for_host(None)
# now we load the roles into the datastructure # now we load the roles into the datastructure
self.included_roles = included_roles self.included_roles = []
ds = self._load_roles(self.roles, ds) ds = self._load_roles(self.roles, ds)
# and finally re-process the vars files as they may have # and finally re-process the vars files as they may have