diff options
| author | Petr Spacek <pspacek@redhat.com> | 2015-06-30 21:48:47 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-07-07 08:37:15 +0200 |
| commit | c0271b9c87d175398ccc89a7e044a4460cee5bc6 (patch) | |
| tree | 52b1fba4e85e67df124fd12a33e462b197fdbb0d /ipaserver | |
| parent | f7c98c650aba0fff10468516c4c2af61c7675277 (diff) | |
| download | freeipa-c0271b9c87d175398ccc89a7e044a4460cee5bc6.tar.gz freeipa-c0271b9c87d175398ccc89a7e044a4460cee5bc6.tar.xz freeipa-c0271b9c87d175398ccc89a7e044a4460cee5bc6.zip | |
DNSSEC: ipa-dns-install: Detect existing master server sooner.
User should get the error before he installs missing packages etc.
https://fedorahosted.org/freeipa/ticket/4657
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/dns.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index bd176c1ef..d22bce7a7 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -94,6 +94,7 @@ def install_check(standalone, replica, options, hostname): global ip_addresses global dns_forwarders global reverse_zones + fstore = sysrestore.FileStore(paths.SYSRESTORE) if standalone: print "==============================================================================" @@ -164,7 +165,18 @@ def install_check(standalone, replica, options, hostname): "Your DNS zones will become unavailable if you " "do not reinstall the DNSSEC key master role immediatelly." % ", ".join([str(zone) for zone in dnssec_zones])) + elif options.dnssec_master: + ods = opendnssecinstance.OpenDNSSECInstance( + fstore, ldapi=True) + ods.realm = api.env.realm + dnssec_masters = ods.get_masters() + # we can reinstall current server if it is dnssec master + if dnssec_masters and api.env.host not in dnssec_masters: + print "DNSSEC key master(s):", u','.join(dnssec_masters) + sys.exit("Only one DNSSEC key master is supported in current " + "version.") + # check opendnssec packages are installed if not opendnssecinstance.check_inst(): sys.exit("Aborting installation") @@ -214,20 +226,6 @@ def install_check(standalone, replica, options, hostname): "the original kasp.db file." % ", ".join([str(zone) for zone in dnssec_zones])) - - fstore = sysrestore.FileStore(paths.SYSRESTORE) - - if options.dnssec_master: - ods = opendnssecinstance.OpenDNSSECInstance( - fstore, ldapi=True) - ods.realm = api.env.realm - dnssec_masters = ods.get_masters() - # we can reinstall current server if it is dnssec master - if api.env.host not in dnssec_masters and dnssec_masters: - print "DNSSEC key master(s):", u','.join(dnssec_masters) - sys.exit("Only one DNSSEC key master is supported in current " - "version.") - ip_addresses = get_server_ip_address( hostname, fstore, options.unattended, True, options.ip_addresses) |