diff options
author | Jan Cholasta <jcholast@redhat.com> | 2015-11-09 18:28:47 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2015-11-25 09:12:25 +0100 |
commit | aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0 (patch) | |
tree | 302b9ef0c8d4afbccc141f4f4b68a42295542cd8 /ipaserver/install/kra.py | |
parent | 5427e7a8c7216b0aa54159a668951d71fb009139 (diff) | |
download | freeipa-aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0.tar.gz freeipa-aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0.tar.xz freeipa-aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0.zip |
install: drop support for Dogtag 9
Dogtag 9 CA and CA DS install and uninstall code was removed. Existing
Dogtag 9 CA and CA DS instances are disabled on upgrade.
Creating a replica of a Dogtag 9 IPA master is still supported.
https://fedorahosted.org/freeipa/ticket/5197
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/kra.py')
-rw-r--r-- | ipaserver/install/kra.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/ipaserver/install/kra.py b/ipaserver/install/kra.py index 40c283e6d..14568ec42 100644 --- a/ipaserver/install/kra.py +++ b/ipaserver/install/kra.py @@ -6,8 +6,8 @@ import os from ipalib import api, errors from ipaplatform import services +from ipaplatform.paths import paths from ipapython import certdb -from ipapython import dogtag from ipapython import ipautil from ipapython.dn import DN from ipaserver.install import custodiainstance @@ -18,9 +18,7 @@ from ipaserver.install import service def install_check(api, replica_config, options): - dogtag_constants = dogtag.configured_constants(api=api) - kra = krainstance.KRAInstance(api.env.realm, - dogtag_constants=dogtag_constants) + kra = krainstance.KRAInstance(api.env.realm) if kra.is_installed(): raise RuntimeError("KRA is already installed.") @@ -61,10 +59,7 @@ def install_check(api, replica_config, options): def install(api, replica_config, options): subject = dsinstance.DsInstance().find_subject_base() if replica_config is None: - kra = krainstance.KRAInstance( - api.env.realm, - dogtag_constants=dogtag.install_constants) - + kra = krainstance.KRAInstance(api.env.realm) kra.configure_instance( api.env.realm, api.env.host, options.dm_password, options.dm_password, subject_base=subject) @@ -78,9 +73,7 @@ def install(api, replica_config, options): custodia.get_kra_keys(replica_config.kra_host_name, ca_data[0], ca_data[1]) - kra = krainstance.KRAInstance( - replica_config.realm_name, - dogtag_constants=dogtag.install_constants) + kra = krainstance.KRAInstance(replica_config.realm_name) kra.configure_replica(replica_config.host_name, replica_config.kra_host_name, replica_config.dirman_password, @@ -96,16 +89,14 @@ def install(api, replica_config, options): kra.ldap_enable('KRA', api.env.host, options.dm_password, api.env.basedn) - kra.enable_client_auth_to_db(kra.dogtag_constants.KRA_CS_CFG_PATH) + kra.enable_client_auth_to_db(paths.KRA_CS_CFG_PATH) # Restart apache for new proxy config file services.knownservices.httpd.restart(capture_output=True) def uninstall(standalone): - dogtag_constants = dogtag.configured_constants(api) - kra = krainstance.KRAInstance(api.env.realm, - dogtag_constants=dogtag_constants) + kra = krainstance.KRAInstance(api.env.realm) if standalone: kra.ldap_connect() |