summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-11-10 14:51:52 -0500
committerLuke Meyer <lmeyer@redhat.com>2017-11-10 14:51:52 -0500
commite31dd8e318bc6bc889b471a57e4559376591a9e5 (patch)
tree75b4879780abdd62c966bd7cc7004b4b22558187
parent34dfb0d9f72f5d1cfbe408eecf45970ad02f5dd3 (diff)
downloadopenshift-e31dd8e318bc6bc889b471a57e4559376591a9e5.tar.gz
openshift-e31dd8e318bc6bc889b471a57e4559376591a9e5.tar.bz2
openshift-e31dd8e318bc6bc889b471a57e4559376591a9e5.tar.xz
openshift-e31dd8e318bc6bc889b471a57e4559376591a9e5.zip
ansible.cfg: error when inventory does not parse
As of Ansible 2.4 this option exists: https://github.com/ansible/ansible/issues/15035#issuecomment-329672168 The kind of error you get later when this is your real problem tends to be *very* confusing. Much better to just fail right away.
-rw-r--r--ansible.cfg4
-rw-r--r--utils/etc/ansible.cfg4
2 files changed, 8 insertions, 0 deletions
diff --git a/ansible.cfg b/ansible.cfg
index 589a58e9d..5a4c1cd80 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -33,6 +33,10 @@ callback_whitelist = profile_tasks
# Uncomment to use the provided AWS dynamic inventory script
#hostfile = inventory/aws/ec2.py
+[inventory]
+# fail more helpfully when the inventory file does not parse (Ansible 2.4+)
+unparsed_is_failed=true
+
# Additional ssh options for OpenShift Ansible
[ssh_connection]
pipelining = True
diff --git a/utils/etc/ansible.cfg b/utils/etc/ansible.cfg
index f7e6fe2ff..562f6544d 100644
--- a/utils/etc/ansible.cfg
+++ b/utils/etc/ansible.cfg
@@ -29,6 +29,10 @@ deprecation_warnings = False
# ssh_args - set if provided by user (cli)
# control_path
+[inventory]
+# fail more helpfully when the inventory file does not parse (Ansible 2.4+)
+unparsed_is_failed=true
+
# Additional ssh options for OpenShift Ansible
[ssh_connection]
# shorten the ControlPath which is often too long; when it is,