From 12e7f71600e62eab9d48a13fba37d2f182c8bdee Mon Sep 17 00:00:00 2001 From: Gabe Date: Wed, 9 Dec 2015 06:41:30 -0700 Subject: ipa-replica-install prints incorrect error message when replica is already installed https://fedorahosted.org/freeipa/ticket/5022 https://fedorahosted.org/freeipa/ticket/5320 Reviewed-By: Martin Basti Reviewed-By: Jan Cholasta --- ipaserver/install/server/replicainstall.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 3122ceb9f..dc8f31db5 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -31,9 +31,8 @@ from ipaserver.install import ( bindinstance, ca, cainstance, certs, dns, dsinstance, httpinstance, installutils, kra, krainstance, krbinstance, memcacheinstance, ntpinstance, otpdinstance, custodiainstance, service) -from ipaserver.install.installutils import create_replica_config -from ipaserver.install.installutils import ReplicaConfig -from ipaserver.install.installutils import load_pkcs12 +from ipaserver.install.installutils import ( + create_replica_config, ReplicaConfig, load_pkcs12, is_ipa_configured) from ipaserver.install.replication import ( ReplicationManager, replica_conn_check) import SSSDConfig @@ -451,6 +450,11 @@ def install_check(installer): tasks.check_selinux_status() + if is_ipa_configured(): + sys.exit("IPA server is already configured on this system.\n" + "If you want to reinstall the IPA server, please uninstall " + "it first using 'ipa-server-install --uninstall'.") + client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) if client_fstore.has_files(): sys.exit("IPA client is already configured on this system.\n" @@ -870,6 +874,11 @@ def promote_check(installer): tasks.check_selinux_status() + if is_ipa_configured(): + sys.exit("IPA server is already configured on this system.\n" + "If you want to reinstall the IPA server, please uninstall " + "it first using 'ipa-server-install --uninstall'.") + client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) if not client_fstore.has_files(): ensure_enrolled(installer) -- cgit