diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-14 20:01:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 20:01:36 -0800 |
| commit | c5afbd8a7643f323f02c3bb1c04cf7f40444995c (patch) | |
| tree | e8c1dd78429c125e338cba997974303193ec31aa | |
| parent | dbbfefbdeb6336105e415cb478193800e11a3134 (diff) | |
| parent | e31dd8e318bc6bc889b471a57e4559376591a9e5 (diff) | |
| download | openshift-c5afbd8a7643f323f02c3bb1c04cf7f40444995c.tar.gz openshift-c5afbd8a7643f323f02c3bb1c04cf7f40444995c.tar.bz2 openshift-c5afbd8a7643f323f02c3bb1c04cf7f40444995c.tar.xz openshift-c5afbd8a7643f323f02c3bb1c04cf7f40444995c.zip | |
Merge pull request #6091 from sosiouxme/20171110-ini-parse-failure
Automatic merge from submit-queue.
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.
I cannot think of any scenario in which it would be preferable to proceed when inventory parsing fails.
| -rw-r--r-- | ansible.cfg | 4 | ||||
| -rw-r--r-- | utils/etc/ansible.cfg | 4 |
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, |