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

Set hosts fact gathering flag based on fact cache entries

Browse source 
Fixes #12213
This commit is contained in:
James Cammarata 2015-09-03 14:10:39 -04:00
parent 7ece767767
commit 4ac2bafc4b
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/executor/play_iterator.py
View file

@ -109,7 +109,7 @@ class PlayIterator:
FAILED_RESCUE = 4 FAILED_RESCUE = 4
FAILED_ALWAYS = 8 FAILED_ALWAYS = 8
def __init__(self, inventory, play, play_context, all_vars): def __init__(self, inventory, play, play_context, variable_manager, all_vars):
self._play = play self._play = play
self._blocks = [] self._blocks = []
@ -121,6 +121,10 @@ class PlayIterator:
self._host_states = {} self._host_states = {}
for host in inventory.get_hosts(self._play.hosts): for host in inventory.get_hosts(self._play.hosts):
self._host_states[host.name] = HostState(blocks=self._blocks) self._host_states[host.name] = HostState(blocks=self._blocks)
# if the host's name is in the variable manager's fact cache, then set
# its _gathered_facts flag to true for smart gathering tests later
if host.name in variable_manager._fact_cache:
host._gathered_facts = True
# if we're looking to start at a specific task, iterate through # if we're looking to start at a specific task, iterate through
# the tasks for this host until we find the specified task # the tasks for this host until we find the specified task
if play_context.start_at_task is not None: if play_context.start_at_task is not None:

8
lib/ansible/executor/task_queue_manager.py
View file

@ -197,7 +197,13 @@ class TaskQueueManager:
raise AnsibleError("Invalid play strategy specified: %s" % new_play.strategy, obj=play._ds) raise AnsibleError("Invalid play strategy specified: %s" % new_play.strategy, obj=play._ds)
# build the iterator # build the iterator
iterator = PlayIterator(inventory=self._inventory, play=new_play, play_context=play_context, all_vars=all_vars) iterator = PlayIterator(
inventory=self._inventory,
play=new_play,
play_context=play_context,
variable_manager=self._variable_manager,
all_vars=all_vars,
)
# and run the play using the strategy # and run the play using the strategy
return strategy.run(iterator, play_context) return strategy.run(iterator, play_context)