wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check for failure in fact gathering

Browse source
This commit is contained in:
Brian Coca 2015-08-15 11:29:10 -04:00
parent 1edae51e05
commit 7a51836530
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/action/package.py
View file

@ -40,8 +40,8 @@ class ActionModule(ActionBase):
if module == 'auto': if module == 'auto':
facts = self._execute_module(module_name='setup', module_args=dict(filter='ansible_pkg_mgr'), task_vars=task_vars) facts = self._execute_module(module_name='setup', module_args=dict(filter='ansible_pkg_mgr'), task_vars=task_vars)
self._display.degug("Facts %s" % facts) self._display.degug("Facts %s" % facts)
module = getattr(facts['ansible_facts'], 'ansible_pkg_mgr', 'auto') if not 'failed' in facts:
module = getattr(facts['ansible_facts'], 'ansible_pkg_mgr', 'auto')
if module != 'auto': if module != 'auto':
# run the 'package' module # run the 'package' module

3
lib/ansible/plugins/action/service.py
View file

@ -40,7 +40,8 @@ class ActionModule(ActionBase):
if module == 'auto': if module == 'auto':
facts = self._execute_module(module_name='setup', module_args=dict(filter='ansible_service_mgr'), task_vars=task_vars) facts = self._execute_module(module_name='setup', module_args=dict(filter='ansible_service_mgr'), task_vars=task_vars)
self._display.debug("Facts %s" % facts) self._display.debug("Facts %s" % facts)
module = getattr(facts['ansible_facts'], 'ansible_service_mgr', 'auto') if not 'failed' in facts:
module = getattr(facts['ansible_facts'], 'ansible_service_mgr', 'auto')
if not module or module == 'auto': if not module or module == 'auto':
module = 'service' module = 'service'