summaryrefslogtreecommitdiffstats
path: root/ipaserver/install
diff options
context:
space:
mode:
Diffstat (limited to 'ipaserver/install')
-rw-r--r--ipaserver/install/bindinstance.py1
-rw-r--r--ipaserver/install/ipa_server_certinstall.py2
-rw-r--r--ipaserver/install/ipa_server_upgrade.py1
-rw-r--r--ipaserver/install/ldapupdate.py1
-rw-r--r--ipaserver/install/plugins/update_managed_permissions.py1
-rw-r--r--ipaserver/install/server/install.py3
6 files changed, 1 insertions, 8 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 77ff342d7..102a8e5f6 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -29,7 +29,6 @@ import ldap
import installutils
import service
-from ipaserver.plugins import ldap2
from ipaserver.install.cainstance import IPA_CA_RECORD
from ipapython import sysrestore, ipautil, ipaldap
from ipapython.ipa_log_manager import *
diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py
index 9e24c4ce0..2e3e34a5e 100644
--- a/ipaserver/install/ipa_server_certinstall.py
+++ b/ipaserver/install/ipa_server_certinstall.py
@@ -31,7 +31,7 @@ from ipapython.ipautil import user_input, write_tmp_file
from ipalib import api, errors
from ipalib.constants import CACERT
from ipaserver.install import certs, dsinstance, httpinstance, installutils
-from ipaserver.plugins.ldap2 import ldap2
+
class ServerCertInstall(admintool.AdminTool):
command_name = 'ipa-server-certinstall'
diff --git a/ipaserver/install/ipa_server_upgrade.py b/ipaserver/install/ipa_server_upgrade.py
index 8373b2134..d0a839d0a 100644
--- a/ipaserver/install/ipa_server_upgrade.py
+++ b/ipaserver/install/ipa_server_upgrade.py
@@ -41,7 +41,6 @@ class ServerUpgrade(admintool.AdminTool):
super(ServerUpgrade, self).run()
api.bootstrap(in_server=True, context='updates')
- import ipaserver.plugins.dogtag # ensure profile backend gets loaded
api.finalize()
try:
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index f30659fe9..848ff1db8 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -45,7 +45,6 @@ from ipaplatform import services
from ipapython.dn import DN
from ipapython.ipa_log_manager import *
from ipapython.ipautil import wait_for_open_socket
-from ipaserver.plugins import ldap2
UPDATES_DIR=paths.UPDATES_DIR
diff --git a/ipaserver/install/plugins/update_managed_permissions.py b/ipaserver/install/plugins/update_managed_permissions.py
index 11765fba3..a2f289f83 100644
--- a/ipaserver/install/plugins/update_managed_permissions.py
+++ b/ipaserver/install/plugins/update_managed_permissions.py
@@ -91,7 +91,6 @@ from ipalib.plugins.permission import permission, permission_del
from ipalib.aci import ACI
from ipalib import Updater
from ipapython import ipautil
-from ipaserver.plugins.ldap2 import ldap2
register = Registry()
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index bde348518..2c5183ba4 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -592,9 +592,6 @@ def install_check(installer):
api.env.ca_host = host_name
api.bootstrap(**cfg)
- if setup_ca:
- # ensure profile backend is available
- import ipaserver.plugins.dogtag
api.finalize()
if setup_ca: