Hello, Patch fix for the following tickets:
https://fedorahosted.org/freeipa/ticket/5022 https://fedorahosted.org/freeipa/ticket/5320 Thanks, Gabe
From 3e0a6c556a3402bbd0e15a6f113498aae27e2cf4 Mon Sep 17 00:00:00 2001 From: Gabe <redhatri...@gmail.com> Date: Mon, 30 Nov 2015 18:42:14 -0700 Subject: [PATCH] ipa-replica-install prints incorrect error message when replica is already installed https://fedorahosted.org/freeipa/ticket/5022 https://fedorahosted.org/freeipa/ticket/5320 --- ipaserver/install/server/replicainstall.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index e6d96bbe62c6960ebe94c529a8dac9dd0468d734..51d4e95dd0e4174ced2f18ec278871138a9c3bc3 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -30,8 +30,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 ( + create_replica_config, is_ipa_configured, ReplicaConfig) from ipaserver.install.replication import ( ReplicationManager, replica_conn_check) import SSSDConfig @@ -405,11 +405,10 @@ def install_check(installer): tasks.check_selinux_status() - client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) - if client_fstore.has_files(): - sys.exit("IPA client is already configured on this system.\n" - "Please uninstall it first before configuring the replica, " - "using 'ipa-client-install --uninstall'.") + if is_ipa_configured(): + sys.exit("IPA replica is already configured on this system.\n" + "If you want to reinstall the IPA replica, please uninstall " + "it first using 'ipa-server-install --uninstall'.") sstore = sysrestore.StateFile(paths.SYSRESTORE) @@ -759,6 +758,11 @@ def promote_check(installer): tasks.check_selinux_status() + if is_ipa_configured(): + sys.exit("IPA replica is already configured on this system.\n" + "If you want to reinstall the IPA replica, please uninstall " + "it first using 'ipa-server-install --uninstall'.") + client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) if not client_fstore.has_files(): sys.exit("IPA client is not configured on this system.\n" -- 2.5.0
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
