diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2010-12-21 14:48:44 +0100 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2010-12-21 17:54:19 -0500 |
| commit | ad25fc07a0fa4e24d935a1f03ef2b9d43d873c03 (patch) | |
| tree | a8d6cbcd6302798f56b275e0b83cba0f02bc0386 | |
| parent | e5e649988eda8502c46aecefda4addeceb3c7851 (diff) | |
| download | freeipa-ad25fc07a0fa4e24d935a1f03ef2b9d43d873c03.tar.gz freeipa-ad25fc07a0fa4e24d935a1f03ef2b9d43d873c03.tar.xz freeipa-ad25fc07a0fa4e24d935a1f03ef2b9d43d873c03.zip | |
Do not require DNS record, just warn if one is missing
| -rw-r--r-- | ipaserver/install/installutils.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index ab7baccaa..b9e2ebdb5 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -58,10 +58,6 @@ def verify_dns_records(host_name, responses, resaddr, family): if family not in familykw.keys(): raise RuntimeError("Unknown faimily %s\n" % family) - if len(responses) == 0: - raise IOError(errno.ENOENT, - "Warning: Hostname (%s) not found with NSS calls" % host_name) - rec = None for rsn in responses: if rsn.dns_type == familykw[family]['dns_type']: @@ -137,13 +133,16 @@ def verify_fqdn(host_name,no_host_dns=False): # Verify that it is a DNS A or AAAA record rs = dnsclient.query(host_name+".", dnsclient.DNS_C_IN, dnsclient.DNS_T_A) - try: + if len(rs) > 0: verify_dns_records(host_name, rs, resaddr, 'ipv4') - except IOError, e: - if e.errno == errno.ENOENT: # retry IPv6 - rs = dnsclient.query(host_name+".", dnsclient.DNS_C_IN, dnsclient.DNS_T_AAAA) - verify_dns_records(host_name, rs, resaddr, 'ipv6') + return + rs = dnsclient.query(host_name+".", dnsclient.DNS_C_IN, dnsclient.DNS_T_AAAA) + if len(rs) > 0: + verify_dns_records(host_name, rs, resaddr, 'ipv6') + return + else: + print "Warning: Hostname (%s) not found in DNS" % host_name def verify_ip_address(ip): is_ok = True |