Hello, replica-install: Fix --domain
Replica installation must not check existence of --domain - the domain must (logically) exist. https://fedorahosted.org/freeipa/ticket/6130 -- Petr^2 Spacek
From 2a038b63f0ad6bc1e68ca62821efa8ced4f32a59 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 25 Jul 2016 15:54:43 +0200 Subject: [PATCH] replica-install: Fix --domain Replica installation must not check existence of --domain - the domain must (logically) exist. https://fedorahosted.org/freeipa/ticket/6130 --- ipaserver/install/server/common.py | 5 ----- ipaserver/install/server/install.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index 45fb2dc17976a08acab16783584524721411fb4e..e6093d15cd1067a83ed89945c4a9c983c66ec06f 100644 --- a/ipaserver/install/server/common.py +++ b/ipaserver/install/server/common.py @@ -284,11 +284,6 @@ class BaseServer(common.Installable, common.Interactive, core.Composite): @domain_name.validator def domain_name(self, value): validate_domain_name(value) - if (self.setup_dns and - not self.dns.allow_zone_overlap): # pylint: disable=no-member - print("Checking DNS domain %s, please wait ..." % value) - check_zone_overlap(value, False) - dm_password = Knob( str, None, diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index c0c676b870b481696ae75742c7bf88074b0ecf9c..8e3af4ab1d65746ea37936a33b8a62d379ec410b 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -17,6 +17,7 @@ import six from ipapython import certmonger, ipaldap, ipautil, sysrestore from ipapython.dn import DN +from ipapython.dnsutil import check_zone_overlap from ipapython.install import core from ipapython.install.common import step from ipapython.install.core import Knob @@ -1256,6 +1257,15 @@ class Server(BaseServer): "Domain Level cannot be higher than {0}".format( constants.MAX_DOMAIN_LEVEL)) + domain_name = Knob(BaseServer.domain_name) + + @domain_name.validator + def domain_name(self, value): + if (self.setup_dns and + not self.dns.allow_zone_overlap): # pylint: disable=no-member + print("Checking DNS domain %s, please wait ..." % value) + check_zone_overlap(value, False) + ip_addresses = Knob( BaseServer.ip_addresses, description=("Master Server IP Address. This option can be used " -- 2.7.4
-- 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
