Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DNS install check: allow overlapping zone to be from the master itself #4001

Closed
wants to merge 3 commits into from

Conversation

@abbra
Copy link
Contributor

@abbra abbra commented Dec 9, 2019

When re-running ipa-server-install --setup-dns on already installed
server, we do not get to the check of being already installed because
DNS zone overlap forces us to fail earlier.

Change exception returned for this case from check_zone_overlap() to
return structured information that allows to understand whether we are
finding a conflict with ourselves.

Use the returned information to only fail DNS check at this point if DNS
zone overlap is generated by a different name server than ourselves.

@abbra abbra added the re-run label Dec 10, 2019
@freeipa-pr-ci freeipa-pr-ci removed the re-run label Dec 10, 2019
@abbra abbra changed the title WIP: DNS install check: allow overlapping zone to be from the master itself DNS install check: allow overlapping zone to be from the master itself Dec 10, 2019
@abbra
Copy link
Contributor Author

@abbra abbra commented Dec 10, 2019

@t-woerner is going to add a test of re-running ipa-server-install to make sure we see already installed message.

@t-woerner
Copy link
Member

@t-woerner t-woerner commented Dec 10, 2019

@t-woerner is going to add a test of re-running ipa-server-install to make sure we see already installed message.

This is only happening if domain is set explicitly in the command line installer as check_zone_overlap is used in the domain_name validator.

@t-woerner t-woerner force-pushed the abbra:fix-installer-dns-zone-on-itself branch 3 times, most recently from 2bab584 to 15f7922 Dec 10, 2019
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch from 15f7922 to 67b4b2a Dec 10, 2019
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch 2 times, most recently from 3bd6df5 to 0381531 Dec 10, 2019
@abbra abbra removed the needs rebase label Dec 10, 2019
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch 3 times, most recently from 9969d1a to 2daa5cd Dec 10, 2019
@abbra abbra added the re-run label Dec 10, 2019
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch from 2daa5cd to eb81e7c Dec 10, 2019
@freeipa-pr-ci freeipa-pr-ci removed the re-run label Dec 10, 2019
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch from eb81e7c to c92b8cb Dec 10, 2019
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch 2 times, most recently from 629bf46 to 7a52fd8 Dec 10, 2019
@abbra
Copy link
Contributor Author

@abbra abbra commented Dec 11, 2019

Tests succeeded, I removed temp commit.

ipapython/dnsutil.py Outdated Show resolved Hide resolved
ipaserver/install/bindinstance.py Outdated Show resolved Hide resolved
ipaserver/install/dns.py Outdated Show resolved Hide resolved
ipaserver/plugins/dns.py Outdated Show resolved Hide resolved
When re-running `ipa-server-install --setup-dns` on already installed
server, we do not get to the check of being already installed because
DNS zone overlap forces us to fail earlier.

Change exception returned for this case from check_zone_overlap() to
return structured information that allows to understand whether we are
finding a conflict with ourselves.

Use the returned information to only fail DNS check at this point if DNS
zone overlap is generated by a different name server than ourselves.
t-woerner added 2 commits Dec 10, 2019
… set

Test that a repeated installation of the primary with DNS enabled
will lead to a already installed message and not in "DNS zone X
already exists in DNS" in check_zone_overlap.

The error is only occuring if domain is set explicitly in the command
line installer as check_zone_overlap is used in the domain_name validator.
For fedora-latest, pki-fedora, fedora-previous and fedora-rawhide
@abbra abbra force-pushed the abbra:fix-installer-dns-zone-on-itself branch from 7a52fd8 to 478cf98 Dec 12, 2019
@tiran
tiran approved these changes Dec 12, 2019
@tiran tiran added ack pushed and removed needs review labels Dec 12, 2019
@tiran
Copy link
Member

@tiran tiran commented Dec 12, 2019

master:

  • dd7fdaa DNS install check: allow overlapping zone to be from the master itself
  • d070c59 Test repeated installation of the primary with DNS enabled and domain set
  • a2820bb Enable TestInstallMasterDNSRepeatedly in prci_definitions
@AdamWill
Copy link
Contributor

@AdamWill AdamWill commented Dec 15, 2019

This was missing a bit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.