internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-03-26 21:33:05 +00:00
Code Issues Projects Releases Wiki Activity

ipaserver: End play if server is already configured or client is configured

Browse Source
This commit is contained in:
Thomas Woerner
2018-01-31 23:39:29 +01:00
parent 4e2b687723
commit 986ac80a60
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
roles/ipaserver/library/ipaserver_test.py
View File

@@ -254,7 +254,13 @@ def main():
# domain_name
if (options.setup_dns and not options.allow_zone_overlap):
check_zone_overlap(options.domain_name, False)
try:
check_zone_overlap(options.domain_name, False)
except ValueError as e:
if "already exists in DNS" in str(e):
ansible_module.log(str(e))
ansible_module.exit_json(changed=False, dns_zone_exists=True)
raise
# dm_password
with redirect_stdout(ansible_log):
@@ -425,16 +431,20 @@ def main():
if not options.external_ca and len(options.external_cert_files) < 1 and \
is_ipa_configured():
options._installation_cleanup = False
ansible_module.fail_json(msg=
ansible_module.log(
"IPA server is already configured on this system. If you want "
"to reinstall the IPA server, please uninstall it first.")
ansible_module.exit_json(changed=False,
server_already_configured=True)
client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
if client_fstore.has_files():
options._installation_cleanup = False
ansible_module.fail_json(
msg="IPA client is already configured on this system. "
ansible_module.log(
"IPA client is already configured on this system. "
"Please uninstall it before configuring the IPA server.")
ansible_module.exit_json(changed=False,
client_already_configured=True)
# validate reverse_zones
if not options.allow_zone_overlap:

2
roles/ipaserver/tasks/install.yml
View File

@@ -91,6 +91,8 @@
### additional ###
register: result_ipaserver_test
- meta: end_play
when: not result_ipaserver_test.changed and (result_ipaserver_test.dns_zone_exists is defined or result_ipaserver_test.client_already_configured is defined or result_ipaserver_test.server_already_configured is defined)
- block: