Re: [Freeipa-devel] [PATCH 0247] Modularization of the DNS subsytem installer
Dne 15.5.2015 v 16:44 Martin Basti napsal(a): On 14/05/15 15:16, Martin Basti wrote: Required for new installers. Patch attached. Updated patch attached. Thanks, ACK. Pushed to master: ae9c3e2dce000ed185b28e2e6e85043ad8d001ed -- Jan Cholasta -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0247] Modularization of the DNS subsytem installer
On 14/05/15 15:16, Martin Basti wrote:
Required for new installers.
Patch attached.
Updated patch attached.
--
Martin Basti
From 71d1762e51603d756b605c28622a5a58c9c351e8 Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Wed, 13 May 2015 18:49:25 +0200
Subject: [PATCH] DNS install: extract DNS installer into one module
This is required modification to be able move to new installers.
DNS subsystem will be installed by functions in this module in each of
ipa-server-install, ipa-dns-install, ipa-replica-install install
scripts.
---
install/tools/ipa-dns-install| 133 ++--
install/tools/ipa-replica-install| 62 ++---
install/tools/ipa-server-install | 116 +
ipaserver/install/dns.py | 210 +++
ipaserver/install/installutils.py| 2 +
ipaserver/install/ipa_replica_prepare.py | 2 +
ipaserver/install/krbinstance.py | 8 +-
7 files changed, 269 insertions(+), 264 deletions(-)
create mode 100644 ipaserver/install/dns.py
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index 4527447a7dbc69ab16bcd93e48f3c02adce684d7..fd9311657e813988310db2be604ca68d26936af5 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -21,18 +21,16 @@
from optparse import OptionGroup, SUPPRESS_HELP
-from ipaserver.install import (service, bindinstance, ntpinstance,
-httpinstance, dnskeysyncinstance, opendnssecinstance, odsexporterinstance)
+from ipaserver.install import bindinstance, httpinstance
from ipaserver.install.installutils import *
from ipaserver.install import installutils
from ipapython import version
-from ipapython import ipautil, sysrestore
-from ipapython.ipaldap import AUTOBIND_ENABLED
-from ipalib import api, errors, util
+from ipalib import api
from ipaplatform.paths import paths
from ipapython.config import IPAOptionParser
from ipapython.ipa_log_manager import standard_logging_setup, root_logger
-from ipapython.ipautil import DN
+
+from ipaserver.install import dns as dns_installer
log_file_name = paths.IPASERVER_INSTALL_LOG
@@ -96,48 +94,6 @@ def main():
installutils.check_server_configuration()
-global fstore
-fstore = sysrestore.FileStore(paths.SYSRESTORE)
-
-print "=="
-print "This program will setup DNS for the FreeIPA Server."
-print ""
-print "This includes:"
-print " * Configure DNS (bind)"
-print " * Configure SoftHSM (required by DNSSEC)"
-print " * Configure ipa-dnskeysyncd (required by DNSSEC)"
-if options.dnssec_master:
-print " * Configure ipa-ods-exporter (required by DNSSEC key master)"
-print " * Configure OpenDNSSEC (required by DNSSEC key master)"
-print " * Generate DNSSEC master key (required by DNSSEC key master)"
-print ""
-print "NOTE: DNSSEC zone signing is not enabled by default"
-print ""
-if options.dnssec_master:
-print "DNSSEC support is experimental!"
-print ""
-print "Plan carefully, current version doesn't allow you to move DNSSEC"
-print "key master to different server and master cannot be uninstalled"
-print ""
-print ""
-print "To accept the default shown in brackets, press the Enter key."
-print ""
-
-if options.dnssec_master and not options.unattended and not ipautil.user_input(
-"Do you want to setup this IPA server as DNSSEC key master?",
-False):
-sys.exit("Aborted")
-
-# Check bind packages are installed
-if not (bindinstance.check_inst(options.unattended) and
-dnskeysyncinstance.check_inst()):
-sys.exit("Aborting installation.")
-
-if options.dnssec_master:
-# check opendnssec packages are installed
-if not opendnssecinstance.check_inst():
-sys.exit("Aborting installation")
-
# Initialize the ipalib api
cfg = dict(
in_server=True,
@@ -146,93 +102,20 @@ def main():
api.bootstrap(**cfg)
api.finalize()
-
-# create BIND and OpenDNSSec instances
-
-bind = bindinstance.BindInstance(fstore, ldapi=True,
- autobind=AUTOBIND_ENABLED)
-
-ods = opendnssecinstance.OpenDNSSECInstance(fstore, ldapi=True,
-autobind=AUTOBIND_ENABLED)
-if options.dnssec_master:
-ods.realm = api.env.realm
-dnssec_masters = ods.get_masters()
-# we can reinstall current server if it is dnssec master
-if not api.env.host in dnssec_masters and dnssec_masters:
-print "DNSSEC key master(s):", u','.join(dnssec_masters)
-sys.exit("Only one DNSSEC key master is supported in current version.")
-
-ip_addresses = get_server_ip_address(api.env.host, fstore,
-options.unattended, True, options.ip_addresses)
[Freeipa-devel] [PATCH 0247] Modularization of the DNS subsytem installer
Required for new installers.
Patch attached.
--
Martin Basti
From 5debe2cba2e0b3a2b532e4cfe2356c8bdfb544a0 Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Wed, 13 May 2015 18:49:25 +0200
Subject: [PATCH] DNS install: extract DNS installer into one module
This is required modification to be able move to new installers.
DNS subsystem will be installed by functions in this module in each of
ipa-server-install, ipa-dns-install, ipa-replica-install install
scripts.
---
install/tools/ipa-dns-install | 134 ++
install/tools/ipa-replica-install | 53 +
install/tools/ipa-server-install | 108 --
ipaserver/install/dns_installer.py | 228 +
4 files changed, 263 insertions(+), 260 deletions(-)
create mode 100644 ipaserver/install/dns_installer.py
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index b7b4998a4b70e663771e3141c8dfe3289d3e192f..82233c0b737b847272f1b821526c15f9d8d5154e 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -21,18 +21,16 @@
from optparse import OptionGroup, SUPPRESS_HELP
-from ipaserver.install import (service, bindinstance, ntpinstance,
-httpinstance, dnskeysyncinstance, opendnssecinstance, odsexporterinstance)
+from ipaserver.install import bindinstance, httpinstance
from ipaserver.install.installutils import *
from ipaserver.install import installutils
from ipapython import version
-from ipapython import ipautil, sysrestore
-from ipapython.ipaldap import AUTOBIND_ENABLED
-from ipalib import api, errors, util
+from ipalib import api
from ipaplatform.paths import paths
from ipapython.config import IPAOptionParser
from ipapython.ipa_log_manager import standard_logging_setup, root_logger
-from ipapython.ipautil import DN
+
+from ipaserver.install import dns_installer
log_file_name = paths.IPASERVER_INSTALL_LOG
@@ -107,48 +105,6 @@ def main():
installutils.check_server_configuration()
-global fstore
-fstore = sysrestore.FileStore(paths.SYSRESTORE)
-
-print "=="
-print "This program will setup DNS for the FreeIPA Server."
-print ""
-print "This includes:"
-print " * Configure DNS (bind)"
-print " * Configure SoftHSM (required by DNSSEC)"
-print " * Configure ipa-dnskeysyncd (required by DNSSEC)"
-if options.dnssec_master:
-print " * Configure ipa-ods-exporter (required by DNSSEC key master)"
-print " * Configure OpenDNSSEC (required by DNSSEC key master)"
-print " * Generate DNSSEC master key (required by DNSSEC key master)"
-print ""
-print "NOTE: DNSSEC zone signing is not enabled by default"
-print ""
-if options.dnssec_master:
-print "DNSSEC support is experimental!"
-print ""
-print "Plan carefully, current version doesn't allow you to move DNSSEC"
-print "key master to different server and master cannot be uninstalled"
-print ""
-print ""
-print "To accept the default shown in brackets, press the Enter key."
-print ""
-
-if options.dnssec_master and not options.unattended and not ipautil.user_input(
-"Do you want to setup this IPA server as DNSSEC key master?",
-False):
-sys.exit("Aborted")
-
-# Check bind packages are installed
-if not (bindinstance.check_inst(options.unattended) and
-dnskeysyncinstance.check_inst()):
-sys.exit("Aborting installation.")
-
-if options.dnssec_master:
-# check opendnssec packages are installed
-if not opendnssecinstance.check_inst():
-sys.exit("Aborting installation")
-
# Initialize the ipalib api
cfg = dict(
in_server=True,
@@ -157,93 +113,17 @@ def main():
api.bootstrap(**cfg)
api.finalize()
+dns_installer.install_check(options, False)
-# create BIND and OpenDNSSec instances
-
-bind = bindinstance.BindInstance(fstore, ldapi=True,
- autobind=AUTOBIND_ENABLED)
-
-ods = opendnssecinstance.OpenDNSSECInstance(fstore, ldapi=True,
-autobind=AUTOBIND_ENABLED)
-if options.dnssec_master:
-ods.realm = api.env.realm
-dnssec_masters = ods.get_masters()
-# we can reinstall current server if it is dnssec master
-if not api.env.host in dnssec_masters and dnssec_masters:
-print "DNSSEC key master(s):", u','.join(dnssec_masters)
-sys.exit("Only one DNSSEC key master is supported in current version.")
-
-ip_addresses = get_server_ip_address(api.env.host, fstore,
-options.unattended, True, options.ip_addresses)
-
-if options.no_forwarders:
-dns_forwarders = ()
-elif options.forwarders:
-dns_forwarders = options.forwarders
-else:
-dns_forwarders = read_d
