diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-07-25 15:54:43 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-07-29 07:38:57 +0200 |
| commit | 6eb9eb730350937692a442b66e4d79d3ebd4eb01 (patch) | |
| tree | 7f7bca6a9bd6004297d69c38d140404d3dcda3d2 | |
| parent | b8b7b9bf8e8a23d652c99c335219abf9de1a6fb7 (diff) | |
replica-install: Fix --domain
Replica installation must not check existence of --domain - the domain
must (logically) exist.
https://fedorahosted.org/freeipa/ticket/6130
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
| -rw-r--r-- | ipaserver/install/server/common.py | 5 | ||||
| -rw-r--r-- | ipaserver/install/server/install.py | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index 45fb2dc17..e6093d15c 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 c0c676b87..65f931820 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 @@ -1199,13 +1200,20 @@ class ServerCA(BaseServerCA): class Server(BaseServer): - realm_name = Knob(BaseServer.realm_name) - domain_name = Knob(BaseServer.domain_name) - setup_ca = None setup_kra = None setup_dns = Knob(BaseServer.setup_dns) + realm_name = Knob(BaseServer.realm_name) + 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) + dm_password = Knob( BaseServer.dm_password, description="Directory Manager password", |