summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2021-02-07 18:29:07 -0500
committerGitHub <noreply@github.com>2021-02-07 17:29:07 -0600
commit9478b59da516ac1ab50079d4b24fac08c029513f (patch)
tree5fa0cb14c0bab246d8626661b8e45481cbe53ee2
parent2c8c02c8168e938835844066570792fb59aad277 (diff)
downloadansible-9478b59da516ac1ab50079d4b24fac08c029513f.tar.gz
fix inventory source parse error handling (#73160) (#73276)
fixes #51025 added test cases (cherry picked from commit 1e27d4052a95d8f19c63d6a37909b3ec690ac832)
-rw-r--r--changelogs/fragments/fix_inventory_source_parse_error_handling.yml2
-rw-r--r--lib/ansible/inventory/manager.py21
-rwxr-xr-xtest/integration/targets/inventory/runme.sh12
3 files changed, 27 insertions, 8 deletions
diff --git a/changelogs/fragments/fix_inventory_source_parse_error_handling.yml b/changelogs/fragments/fix_inventory_source_parse_error_handling.yml
new file mode 100644
index 0000000000..6782a7529f
--- /dev/null
+++ b/changelogs/fragments/fix_inventory_source_parse_error_handling.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - Correct the inventory source error parse handling, specifically make the config INVENTORY_ANY_UNPARSED_IS_FAILED work as expected.
diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py
index 5606b2655e..d908b74e73 100644
--- a/lib/ansible/inventory/manager.py
+++ b/lib/ansible/inventory/manager.py
@@ -305,19 +305,24 @@ class InventoryManager(object):
failures.append({'src': source, 'plugin': plugin_name, 'exc': AnsibleError(e), 'tb': tb})
else:
display.vvv("%s declined parsing %s as it did not pass its verify_file() method" % (plugin_name, source))
- else:
- if not parsed and failures:
+
+ if not parsed:
+ # only warn/error if NOT using the default or using it and the file is present
+ # TODO: handle 'non file' inventorya and detect vs hardcode default
+ if source != '/etc/ansible/hosts' or os.path.exists(source):
+
+ if failures:
# only if no plugin processed files should we show errors.
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 'tb' in fail:
display.vvv(to_text(fail['tb']))
- if C.INVENTORY_ANY_UNPARSED_IS_FAILED:
- raise AnsibleError(u'Completely failed to parse inventory source %s' % (source))
- if not parsed:
- if source != '/etc/ansible/hosts' or os.path.exists(source):
- # only warn if NOT using the default and if using it, only if the file is present
- display.warning("Unable to parse %s as an inventory source" % source)
+
+ # final erorr/warning on inventory source failure
+ if C.INVENTORY_ANY_UNPARSED_IS_FAILED:
+ raise AnsibleError(u'Completely failed to parse inventory source %s' % (source))
+ else:
+ display.warning("Unable to parse %s as an inventory source" % source)
# clear up, jic
self._inventory.current_source = None
diff --git a/test/integration/targets/inventory/runme.sh b/test/integration/targets/inventory/runme.sh
index 3cd533cde7..70565a99a3 100755
--- a/test/integration/targets/inventory/runme.sh
+++ b/test/integration/targets/inventory/runme.sh
@@ -34,3 +34,15 @@ ansible-playbook -i ../../inventory --limit @"${empty_limit_file}" playbook.yml
ansible-playbook -i ../../inventory "$@" strategy.yml
ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS=always ansible-playbook -i ../../inventory "$@" strategy.yml
ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS=never ansible-playbook -i ../../inventory "$@" strategy.yml
+
+# test parse inventory fail is not an error per config
+ANSIBLE_INVENTORY_UNPARSED_FAILED=False ANSIBLE_INVENTORY_ANY_UNPARSED_IS_FAILED=False ansible -m ping localhost -i /idontexist "$@"
+
+# test no inventory parse is an error with var
+[ "$(ANSIBLE_INVENTORY_UNPARSED_FAILED=True ANSIBLE_INVENTORY_ANY_UNPARSED_IS_FAILED=False ansible -m ping localhost -i /idontexist)" != "0" ]
+
+# test single inventory no parse is not an error with var
+ANSIBLE_INVENTORY_UNPARSED_FAILED=True ANSIBLE_INVENTORY_ANY_UNPARSED_IS_FAILED=False ansible -m ping localhost -i /idontexist -i ../../invenotory "$@"
+
+# test single inventory no parse is an error with any var
+[ "$(ANSIBLE_INVENTORY_ANY_UNPARSED_IS_FAILED=True ansible -m ping localhost -i /idontexist -i ../../invenotory)" != "0" ]