diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-04-26 20:09:19 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-10 10:13:56 +0200 |
| commit | 475547fa40f6244ce838b8ce30e77cf32ee250be (patch) | |
| tree | 04fadc618a5d4ee87325338bd027dd4a343980f5 | |
| parent | 51db9380cfc862993e1909602d2726e851f463b4 (diff) | |
| download | freeipa-475547fa40f6244ce838b8ce30e77cf32ee250be.tar.gz freeipa-475547fa40f6244ce838b8ce30e77cf32ee250be.tar.xz freeipa-475547fa40f6244ce838b8ce30e77cf32ee250be.zip | |
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 <mbasti@redhat.com>
| -rw-r--r-- | ipaserver/install/plugins/dns.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |