URL: https://github.com/freeipa/freeipa/pull/2134 Author: Tiboris Title: #2134: [Backport][ipa-4-6] Fix DNSSEC install regression Action: opened
PR body: """ This PR was opened and then ACKed automatically because backport of PR #2028 was required. Wait for CI to finish before pushing. In case of questions or problems contact @tiran who is author of the original PR. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2134/head:pr2134 git checkout pr2134
From 7b9cdef6eef01cf345ca75c0dc1c4548b462e4db Mon Sep 17 00:00:00 2001 From: Christian Heimes <chei...@redhat.com> Date: Tue, 10 Jul 2018 12:51:36 +0200 Subject: [PATCH] Fix DNSSEC install regression 7284097eedef70dd556270732e6ab8e23501ce09 introduced a regression in DNSSEC master installation. For standalone and replica installation, services have to be enabled before checking bind config. Fixes: https://pagure.io/freeipa/issue/7635 See: https://pagure.io/freeipa/issue/7566 Signed-off-by: Christian Heimes <chei...@redhat.com> Reviewed-By: Tibor Dudlak <tdud...@redhat.com> --- .freeipa-pr-ci.yaml | 11 +++++++++++ install/tools/ipa-dns-install | 5 +---- ipaserver/install/dns.py | 5 +++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml index 2ce81f9326..fc50f1d2e8 100644 --- a/.freeipa-pr-ci.yaml +++ b/.freeipa-pr-ci.yaml @@ -75,3 +75,14 @@ jobs: timeout: 3600 topology: *master_1repl + fedora-27/dnssec: + requires: [fedora-27/build] + priority: 50 + job: + class: RunPytest + args: + build_url: '{fedora-27/build_url}' + test_suite: test_integration/test_dnssec.py::TestInstallDNSSECFirst + template: *ci-master-f27 + timeout: 3600 + topology: *master_1repl diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 57dde5a5da..32a17d223a 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -37,7 +37,6 @@ from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import standard_logging_setup from ipaserver.install import dns as dns_installer -from ipaserver.install import service logger = logging.getLogger(os.path.basename(__file__)) @@ -149,9 +148,7 @@ def main(): dns_installer.install_check(True, api, False, options, hostname=api.env.host) dns_installer.install(True, False, options) - # Enable configured services and update DNS SRV records - service.enable_services(api.env.host) - api.Command.dns_update_system_records() + # Services are enabled in dns_installer.install() # execute ipactl to refresh services status ipautil.run(['ipactl', 'start', '--ignore-service-failures'], diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 7c4393ea06..9efe7ff730 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -44,6 +44,7 @@ from ipaserver.install import dnskeysyncinstance from ipaserver.install import odsexporterinstance from ipaserver.install import opendnssecinstance +from ipaserver.install import service if six.PY3: unicode = str @@ -357,6 +358,10 @@ def install(standalone, replica, options, api=api): dnskeysyncd.start_dnskeysyncd() bind.start_named() + # Enable configured services for standalone check_global_configuration() + if standalone: + service.enable_services(api.env.host) + # this must be done when bind is started and operational bind.update_system_records()
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/IVS7Y53SXJ5HX5N54MFSI6DKV36QB5CU/
