From 475547fa40f6244ce838b8ce30e77cf32ee250be Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Tue, 26 Apr 2016 20:09:19 +0200 Subject: [PATCH] DNS: Fix upgrade - master to forward zone transformation This happens when upgrading from IPA <= 4.0 to versions 4.3+. DNS caching might cause false positive in code which replaces master zone with forward zone. This will effectivelly delete the master zone without adding a replacement forward zone. Solution is to use skip_overlap_check option for dnsforwardzone_add command so zone existence check is skipped and the upgrade can proceed. https://fedorahosted.org/freeipa/ticket/5851 Reviewed-By: Martin Basti --- ipaserver/install/plugins/dns.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py index 79ff9c9ac..c72395327 100644 --- a/ipaserver/install/plugins/dns.py +++ b/ipaserver/install/plugins/dns.py @@ -302,7 +302,9 @@ class update_master_to_dnsforwardzones(Updater): try: kw = { 'idnsforwarders': zone.get('idnsforwarders', []), - 'idnsforwardpolicy': zone.get('idnsforwardpolicy', [u'first'])[0] + 'idnsforwardpolicy': zone.get('idnsforwardpolicy', + [u'first'])[0], + 'skip_overlap_check': True, } self.api.Command['dnsforwardzone_add'](zone['idnsname'][0], **kw) except Exception as e: