Fix DNSSEC install regression

7284097eed 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 <cheimes@redhat.com>
Reviewed-By: Tibor Dudlak <tdudlak@redhat.com>
This commit is contained in:
Christian Heimes
2018-07-10 17:51:05 +02:00
committed by Tibor Dudlák
parent 2b669c52a5
commit 9222a08c28
3 changed files with 18 additions and 4 deletions
+12
View File
@@ -230,3 +230,15 @@ jobs:
template: *ci-master-f28 template: *ci-master-f28
timeout: 3600 timeout: 3600
topology: *master_1repl topology: *master_1repl
fedora-28/dnssec:
requires: [fedora-28/build]
priority: 50
job:
class: RunPytest
args:
build_url: '{fedora-28/build_url}'
test_suite: test_integration/test_dnssec.py::TestInstallDNSSECFirst
template: *ci-master-f28
timeout: 3600
topology: *master_1repl
+1 -4
View File
@@ -35,7 +35,6 @@ from ipapython.config import IPAOptionParser
from ipapython.ipa_log_manager import standard_logging_setup from ipapython.ipa_log_manager import standard_logging_setup
from ipaserver.install import dns as dns_installer from ipaserver.install import dns as dns_installer
from ipaserver.install import service
logger = logging.getLogger(os.path.basename(__file__)) logger = logging.getLogger(os.path.basename(__file__))
@@ -142,9 +141,7 @@ def main():
dns_installer.install_check(True, api, False, options, hostname=api.env.host) dns_installer.install_check(True, api, False, options, hostname=api.env.host)
dns_installer.install(True, False, options) dns_installer.install(True, False, options)
# Enable configured services and update DNS SRV records # Services are enabled in dns_installer.install()
service.enable_services(api.env.host)
api.Command.dns_update_system_records()
# execute ipactl to refresh services status # execute ipactl to refresh services status
ipautil.run([paths.IPACTL, 'start', '--ignore-service-failures'], ipautil.run([paths.IPACTL, 'start', '--ignore-service-failures'],
+5
View File
@@ -44,6 +44,7 @@ from ipaserver.install import bindinstance
from ipaserver.install import dnskeysyncinstance from ipaserver.install import dnskeysyncinstance
from ipaserver.install import odsexporterinstance from ipaserver.install import odsexporterinstance
from ipaserver.install import opendnssecinstance from ipaserver.install import opendnssecinstance
from ipaserver.install import service
if six.PY3: if six.PY3:
unicode = str unicode = str
@@ -356,6 +357,10 @@ def install(standalone, replica, options, api=api):
dnskeysyncd.start_dnskeysyncd() dnskeysyncd.start_dnskeysyncd()
bind.start_named() 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 # this must be done when bind is started and operational
bind.update_system_records() bind.update_system_records()