internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-06-23 09:14:43 +00:00
Code Issues Projects Releases Wiki Activity

ipaserver_prepare: Properly report error, do show trace back

Browse Source 
The raises of RuntimeError, ValueError and ScriptError are currently not
properly handled in ipaserver_prepare. This results in a trace back error
shown in Ansible instead of only showing the error message.

This happened for example if a nameserver is in /etc/resolv.conf that is
not reachable.
This commit is contained in:
Thomas Woerner
2019-07-02 13:38:41 +02:00
parent da2631d923
commit 115f96d0be
1 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ipaserver/library/ipaserver_prepare.py
View File

@@ -195,6 +195,8 @@ def main():
if not options.ca_subject: if not options.ca_subject:
options.ca_subject = str(default_ca_subject_dn(options.subject_base)) options.ca_subject = str(default_ca_subject_dn(options.subject_base))
try:
# Configuration for ipalib, we will bootstrap and finalize later, after # Configuration for ipalib, we will bootstrap and finalize later, after
# we are sure we have the configuration file ready. # we are sure we have the configuration file ready.
cfg = dict( cfg = dict(
@@ -286,6 +288,10 @@ def main():
if tasks.configure_pkcs11_modules(fstore): if tasks.configure_pkcs11_modules(fstore):
ansible_log.info("Disabled p11-kit-proxy") ansible_log.info("Disabled p11-kit-proxy")
except (RuntimeError, ValueError, ScriptError,
ipautil.CalledProcessError) as e:
ansible_module.fail_json(msg=str(e))
ansible_module.exit_json(changed=True, ansible_module.exit_json(changed=True,
### basic ### ### basic ###
ip_addresses=[ str(ip) for ip in ip_addresses ], ip_addresses=[ str(ip) for ip in ip_addresses ],