IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

replica-install: Fix --domain

Browse Source 
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>
This commit is contained in:
Petr Spacek 2016-07-25 15:54:43 +02:00 committed by Jan Cholasta
parent b8b7b9bf8e
commit 6eb9eb7303
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipaserver/install/server/common.py
View File

@ -284,11 +284,6 @@ class BaseServer(common.Installable, common.Interactive, core.Composite):
@domain_name.validator @domain_name.validator
def domain_name(self, value): def domain_name(self, value):
validate_domain_name(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( dm_password = Knob(
str, None, str, None,

14
ipaserver/install/server/install.py
View File

@ -17,6 +17,7 @@ import six
from ipapython import certmonger, ipaldap, ipautil, sysrestore from ipapython import certmonger, ipaldap, ipautil, sysrestore
from ipapython.dn import DN from ipapython.dn import DN
from ipapython.dnsutil import check_zone_overlap
from ipapython.install import core from ipapython.install import core
from ipapython.install.common import step from ipapython.install.common import step
from ipapython.install.core import Knob from ipapython.install.core import Knob
@ -1199,13 +1200,20 @@ class ServerCA(BaseServerCA):
class Server(BaseServer): class Server(BaseServer):
realm_name = Knob(BaseServer.realm_name)
domain_name = Knob(BaseServer.domain_name)
setup_ca = None setup_ca = None
setup_kra = None setup_kra = None
setup_dns = Knob(BaseServer.setup_dns) 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( dm_password = Knob(
BaseServer.dm_password, BaseServer.dm_password,
description="Directory Manager password", description="Directory Manager password",