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

Fix meta tasks used with --flush-cache (#71311)

Browse source 
* Remove incorrect code
This commit is contained in:
Sloane Hertel 2020-08-18 11:41:58 -04:00 committed by GitHub
parent 4afc228108
commit 88bfc7977d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/fix_meta_tasks_with_flush_cache.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fix execution of the meta tasks 'clear_facts', 'clear_host_errors', 'end_play', 'end_host', and 'reset_connection' when the CLI flag '--flush-cache' is provided.

4
lib/ansible/plugins/strategy/__init__.py
View file

@ -194,7 +194,6 @@ class StrategyBase:
self._final_q = tqm._final_q self._final_q = tqm._final_q
self._step = context.CLIARGS.get('step', False) self._step = context.CLIARGS.get('step', False)
self._diff = context.CLIARGS.get('diff', False) self._diff = context.CLIARGS.get('diff', False)
self.flush_cache = context.CLIARGS.get('flush_cache', False)
# the task cache is a dictionary of tuples of (host.name, task._uuid) # the task cache is a dictionary of tuples of (host.name, task._uuid)
# used to find the original task object of in-flight tasks and to store # used to find the original task object of in-flight tasks and to store
@ -1139,6 +1138,7 @@ class StrategyBase:
skipped = False skipped = False
msg = '' msg = ''
# The top-level conditions should only compare meta_action
if meta_action == 'noop': if meta_action == 'noop':
# FIXME: issue a callback for the noop here? # FIXME: issue a callback for the noop here?
if task.when: if task.when:
@ -1151,7 +1151,7 @@ class StrategyBase:
self.run_handlers(iterator, play_context) self.run_handlers(iterator, play_context)
self._flushed_hosts[target_host] = False self._flushed_hosts[target_host] = False
msg = "ran handlers" msg = "ran handlers"
elif meta_action == 'refresh_inventory' or self.flush_cache: elif meta_action == 'refresh_inventory':
if task.when: if task.when:
self._cond_not_supported_warn(meta_action) self._cond_not_supported_warn(meta_action)
self._inventory.refresh_inventory() self._inventory.refresh_inventory()