From 1600146c942eedcbeb4f67537ee35d1e73c46b24 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 13 Dec 2010 14:28:11 -0500 Subject: Verify that the replication plugin exists before setting up replicas. ticket 502 --- install/tools/ipa-replica-install | 3 +++ install/tools/ipa-replica-prepare | 3 +++ 2 files changed, 6 insertions(+) (limited to 'install/tools') diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 50855fde9..0826afa59 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -28,6 +28,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 from ipaserver.plugins.ldap2 import ldap2 from ipapython import version from ipalib import api, errors, util @@ -279,6 +280,8 @@ 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 b9e3425ea..9d7a14b81 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -29,6 +29,7 @@ from optparse import OptionParser from ipapython import ipautil from ipaserver.install import bindinstance, dsinstance, installutils, certs from ipaserver.install.bindinstance import add_zone, add_reverze_zone, add_rr, add_ptr_rr +from ipaserver.install.replication import check_replication_plugin from ipaserver.plugins.ldap2 import ldap2 from ipapython import version from ipalib import api, errors, util @@ -228,6 +229,8 @@ def get_dirman_password(): return installutils.read_password("Directory Manager (existing master)", confirm=False, validate=False) def main(): + if not check_replication_plugin(): + sys.exit(1) options, args = parse_options() replica_fqdn = args[0] -- cgit