summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-09-20 10:40:16 +0200
committerMartin Kosek <mkosek@redhat.com>2011-09-22 13:14:23 +0200
commit9ccd979f02b85e4d7cdccdf3502fead94643a08d (patch)
tree2024aae70ef5a0aa618526008e78ae0a6ee43554
parent3112822a48324f1c537db234d5d7e84d6f95c2eb (diff)
downloadfreeipa-9ccd979f02b85e4d7cdccdf3502fead94643a08d.tar.gz
freeipa-9ccd979f02b85e4d7cdccdf3502fead94643a08d.tar.xz
freeipa-9ccd979f02b85e4d7cdccdf3502fead94643a08d.zip
Remove checks for ds-replication plugin
The replication plugin is no longer shipped as a separate package. Remove the code checking its existence. https://fedorahosted.org/freeipa/ticket/1815
-rwxr-xr-xinstall/tools/ipa-replica-install4
-rwxr-xr-xinstall/tools/ipa-replica-prepare4
-rw-r--r--ipaserver/install/replication.py15
3 files changed, 2 insertions, 21 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 9b7e6438..af317cde 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -29,7 +29,7 @@ from ipapython import ipautil
from ipaserver.install import dsinstance, installutils, krbinstance, service
from ipaserver.install import bindinstance, httpinstance, ntpinstance, certs
-from ipaserver.install.replication import check_replication_plugin, replica_conn_check
+from ipaserver.install.replication import replica_conn_check
from ipaserver.install.installutils import HostnameLocalhost, resolve_host
from ipaserver.install.installutils import ReplicaConfig, expand_replica_info, read_replica_info
from ipaserver.install.installutils import get_host_name
@@ -282,8 +282,6 @@ def check_bind():
sys.exit(1)
def main():
- if not check_replication_plugin():
- sys.exit(1)
safe_options, options, filename = parse_options()
installutils.standard_logging_setup("/var/log/ipareplica-install.log", options.debug)
logging.debug('%s was invoked with argument "%s" and options: %s' % (sys.argv[0], filename, safe_options))
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare
index 9f935262..c3601907 100755
--- a/install/tools/ipa-replica-prepare
+++ b/install/tools/ipa-replica-prepare
@@ -28,7 +28,7 @@ import krbV
from ipapython import ipautil
from ipaserver.install import bindinstance, dsinstance, installutils, certs
from ipaserver.install.bindinstance import add_zone, add_reverse_zone, add_fwd_rr, add_ptr_rr
-from ipaserver.install.replication import check_replication_plugin, enable_replication_version_checking
+from ipaserver.install.replication import enable_replication_version_checking
from ipaserver.install.installutils import resolve_host
from ipaserver.plugins.ldap2 import ldap2
from ipapython import version
@@ -229,8 +229,6 @@ def get_dirman_password():
def main():
installutils.check_server_configuration()
- if not check_replication_plugin():
- sys.exit(1)
options, args = parse_options()
replica_fqdn = args[0]
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 961e7133..986fb5e8 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -75,21 +75,6 @@ def replica_conn_check(master_host, host_name, realm, check_ca,
else:
print "Connection check OK"
-
-def check_replication_plugin():
- """
- Confirm that the 389-ds replication is installed.
-
- Emit a message and return True/False
- """
- if not os.path.exists('/usr/lib/dirsrv/plugins/libreplication-plugin.so') and \
- not os.path.exists('/usr/lib64/dirsrv/plugins/libreplication-plugin.so'):
- print "The 389-ds replication plug-in was not found on this system."
- print "Please install the 'ds-replication' package and start the installation again"
- return False
-
- return True
-
def enable_replication_version_checking(hostname, realm, dirman_passwd):
"""
Check the replication version checking plugin. If it is not