cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #431 from bradobro/fix_tasksafterfailure

Browse source 
Fix to make 0.5 hosts with failures not be included in future task executions
This commit is contained in:
Michael DeHaan 2012-05-30 13:08:09 -07:00
commit 0eca3030f4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/inventory/__init__.py
View file

@ -89,9 +89,10 @@ class Inventory(object):
for host in group.get_hosts():
for pat in patterns:
if group.name == pat or pat == 'all' or self._match(host.name, pat):
if not self._restriction:
#must test explicitly for None because [] means no hosts allowed
if self._restriction==None:
hosts[host.name] = host
if self._restriction and host.name in self._restriction:
elif host.name in self._restriction:
hosts[host.name] = host
return sorted(hosts.values(), key=lambda x: x.name)

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

@ -282,7 +282,6 @@ class PlayBook(object):
# now with that data, handle contentional variable file imports!
if play.vars_files and len(play.vars_files) > 0:
rc = self._do_setup_step(play, play.vars_files)
#else: warn "You have a vars_files section but didn't state any vars files??
# run all the top level tasks, these get run on every node
for task in play.tasks():