diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2017-02-17 13:50:09 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-01 15:55:45 +0100 |
| commit | 13b5821fa4d32b5a1cc69a97386853fad44236ec (patch) | |
| tree | ef5fb3b22df6ffd07f5aacbc6416f92ea9a0f292 /ipaserver | |
| parent | 77857ea77662e005b1a23039e2f9173c0a9b080b (diff) | |
| download | freeipa-13b5821fa4d32b5a1cc69a97386853fad44236ec.tar.gz freeipa-13b5821fa4d32b5a1cc69a97386853fad44236ec.tar.xz freeipa-13b5821fa4d32b5a1cc69a97386853fad44236ec.zip | |
expose AD trust related knobs in composite installers
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/server/__init__.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/ipaserver/install/server/__init__.py b/ipaserver/install/server/__init__.py index 86cb4a9ef..743da8d67 100644 --- a/ipaserver/install/server/__init__.py +++ b/ipaserver/install/server/__init__.py @@ -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) |