URL: https://github.com/freeipa/freeipa/pull/1427 Author: justin-stephenson Title: #1427: Skip zone overlap check with auto-reverse Action: opened
PR body: """ Skip the existing reverse zone overlap check during DNS installation when both `--auto-reverse` and `--allow-zone-overlap` arguments are provided together. https://pagure.io/freeipa/issue/7239 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/1427/head:pr1427 git checkout pr1427
From 84cb77ac499fb95ee1ca8a6657d352bb4453abbe Mon Sep 17 00:00:00 2001 From: Justin Stephenson <jstep...@redhat.com> Date: Wed, 27 Dec 2017 16:32:47 -0500 Subject: [PATCH] Skip zone overlap check with auto-reverse Skip the existing reverse zone overlap check during DNS installation when both --auto-reverse and --allow-zone-overlap arguments are provided. https://pagure.io/freeipa/issue/7239 --- ipaserver/install/bindinstance.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index a50fd9ff05..f87c909cdc 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -302,7 +302,7 @@ def read_reverse_zone(default, ip_address, allow_zone_overlap=False): return normalize_zone(zone) -def get_auto_reverse_zones(ip_addresses): +def get_auto_reverse_zones(ip_addresses, allow_zone_overlap=False): auto_zones = [] for ip in ip_addresses: if ipautil.reverse_record_exists(ip): @@ -310,12 +310,13 @@ def get_auto_reverse_zones(ip_addresses): logger.info("Reverse record for IP address %s already exists", ip) continue default_reverse = get_reverse_zone_default(ip) - try: - dnsutil.check_zone_overlap(default_reverse) - except ValueError: - logger.info("Reverse zone %s for IP address %s already exists", - default_reverse, ip) - continue + if not allow_zone_overlap: + try: + dnsutil.check_zone_overlap(default_reverse) + except ValueError: + logger.info("Reverse zone %s for IP address %s already exists", + default_reverse, ip) + continue auto_zones.append((ip, default_reverse)) return auto_zones @@ -486,7 +487,8 @@ def check_reverse_zones(ip_addresses, reverse_zones, options, unattended, ips_missing_reverse.append(ip) # create reverse zone for IP addresses that does not have one - for (ip, rz) in get_auto_reverse_zones(ips_missing_reverse): + for (ip, rz) in get_auto_reverse_zones(ips_missing_reverse, + options.allow_zone_overlap): if options.auto_reverse: logger.info("Reverse zone %s will be created", rz) checked_reverse_zones.append(rz)
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
