diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-03-07 10:52:35 +0100 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2016-04-28 18:46:06 +0200 |
commit | 9ee6d379c496cd1648d58a6ecca72ed41638a3f1 (patch) | |
tree | 5e5c95c628777dd237f4adbdad4df7f537343c8e /install/tools | |
parent | c34af691def03313b61a231b85213c8f20e44cfa (diff) | |
download | freeipa-9ee6d379c496cd1648d58a6ecca72ed41638a3f1.tar.gz freeipa-9ee6d379c496cd1648d58a6ecca72ed41638a3f1.tar.xz freeipa-9ee6d379c496cd1648d58a6ecca72ed41638a3f1.zip |
Remove function ipapython.ipautil.host_exists()
The function duplicated ipalib.util.verify_host_resolvable() in slightly
incompatible way because it used NSS while rest of IPA is using only DNS.
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'install/tools')
-rwxr-xr-x | install/tools/ipa-replica-manage | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 4855a352b..8920c402a 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -38,7 +38,7 @@ from ipaserver.install import opendnssecinstance, dnskeysyncinstance from ipapython import version, ipaldap from ipalib import api, errors from ipalib.constants import CACERT -from ipalib.util import has_managed_topology +from ipalib.util import has_managed_topology, verify_host_resolvable from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipapython.dn import DN from ipapython.config import IPAOptionParser @@ -814,10 +814,14 @@ def check_last_link(delrepl, realm, dirman_passwd, force): def enforce_host_existence(host, message=None): - if host is not None and not ipautil.host_exists(host): - if message is None: - message = "Unknown host %s" % host + if host is None: + return + try: + verify_host_resolvable(host, root_logger) + except errors.DNSNotARecordError as ex: + if message is None: + message = "Unknown host %s: %s" % (host, ex) sys.exit(message) def ensure_last_services(conn, hostname, masters, options): |