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

catch all cases of no inventory when asked to fail

Browse source 
fixes #36034
This commit is contained in:
Brian Coca 2018-02-20 09:54:34 -05:00 committed by Brian Coca
parent 3d06ce245a
commit fdbd1297cf
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/ansible/inventory/manager.py
View file

@ -211,7 +211,10 @@ class InventoryManager(object):
# do post processing # do post processing
self._inventory.reconcile_inventory() self._inventory.reconcile_inventory()
else: else:
display.warning("No inventory was parsed, only implicit localhost is available") if C.INVENTORY_UNPARSED_IS_FAILED:
raise AnsibleError("No inventory was parsed, please check your configuration and options.")
else:
display.warning("No inventory was parsed, only implicit localhost is available")
self._inventory_plugins = [] self._inventory_plugins = []
@ -273,18 +276,10 @@ class InventoryManager(object):
else: else:
if not parsed and failures: if not parsed and failures:
# only if no plugin processed files should we show errors. # only if no plugin processed files should we show errors.
if C.INVENTORY_UNPARSED_IS_FAILED: for fail in failures:
msg = "Could not parse inventory source %s with available plugins:\n" % source display.warning(u'\n* Failed to parse %s with %s plugin: %s' % (to_text(fail['src']), fail['plugin'], to_text(fail['exc'])))
for fail in failures: if hasattr(fail['exc'], 'tb'):
msg += 'Plugin %s failed: %s\n' % (fail['plugin'], to_native(fail['exc'])) display.vvv(to_text(fail['exc'].tb))
if display.verbosity >= 3:
msg += "%s\n" % fail['exc'].tb
raise AnsibleParserError(msg)
else:
for fail in failures:
display.warning(u'\n* Failed to parse %s with %s plugin: %s' % (to_text(fail['src']), fail['plugin'], to_text(fail['exc'])))
if hasattr(fail['exc'], 'tb'):
display.vvv(to_text(fail['exc'].tb))
if not parsed: if not parsed:
display.warning("Unable to parse %s as an inventory source" % to_text(source)) display.warning("Unable to parse %s as an inventory source" % to_text(source))