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

expose AD trust related knobs in composite installers

Browse Source 
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Martin Babinsky 2017-02-17 13:50:09 +01:00 committed by Martin Basti
parent 77857ea776
commit 13b5821fa4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipaserver/install/server/__init__.py
View File

@ -38,13 +38,14 @@ from .replicainstall import install_check as replica_install_check
from .replicainstall import promote_check as replica_promote_check
from .upgrade import upgrade_check, upgrade
from .. import ca, conncheck, dns, kra
from .. import adtrust, ca, conncheck, dns, kra
class ServerInstallInterface(client.ClientInstallInterface,
ca.CAInstallInterface,
kra.KRAInstallInterface,
dns.DNSInstallInterface,
adtrust.ADTrustInstallInterface,
conncheck.ConnCheckInterface):
"""
Interface of server installers
@ -144,6 +145,10 @@ class ServerInstallInterface(client.ClientInstallInterface,
"Domain Level cannot be higher than {0}".format(
constants.MAX_DOMAIN_LEVEL))
setup_adtrust = knob(
None,
description="configure AD trust capability"
)
setup_ca = knob(
None,
description="configure a dogtag CA",
@ -331,6 +336,11 @@ class ServerInstallInterface(client.ClientInstallInterface,
)
pkinit_cert_name = prepare_only(pkinit_cert_name)
add_agents = knob(
bases=adtrust.ADTrustInstallInterface.add_agents
)
add_agents = replica_install_only(add_agents)
def __init__(self, **kwargs):
super(ServerInstallInterface, self).__init__(**kwargs)
@ -548,6 +558,10 @@ class ServerMasterInstall(ServerMasterInstallInterface):
def admin_password(self, value):
validate_admin_password(value)
# always run sidgen task and do not allow adding agents on first master
add_sids = True
add_agents = False
def __init__(self, **kwargs):
super(ServerMasterInstall, self).__init__(**kwargs)
master_init(self)