Hi,

the attached patch fixes <https://fedorahosted.org/freeipa/ticket/5542>.

Honza

--
Jan Cholasta
From 9981523cb21abba358f54ff6b801211c9e41b16c Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jchol...@redhat.com>
Date: Mon, 14 Dec 2015 15:15:44 +0100
Subject: [PATCH] replica promotion: let ipa-client-install validate enrollment
 options

ipa-client-install output is redirected to standard output, so let it print
its own error message for missing options.

https://fedorahosted.org/freeipa/ticket/5542
---
 ipaserver/install/server/replicainstall.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index c6927a5..4e6abde 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -812,15 +812,6 @@ def install(installer):
 def ensure_enrolled(installer):
     config = installer._config
 
-    # Perform only if we have the necessary options
-    if not any([installer.password,
-                installer.admin_password,
-                installer.keytab]):
-        sys.exit("IPA client is not configured on this system.\n"
-                 "You must join the system by running 'ipa-client-install' "
-                 "first. Alternatively, you may specify enrollment related "
-                 "options directly, see man ipa-replica-install.")
-
     # Call client install script
     service.print_msg("Configuring client side components")
     try:
-- 
2.4.3

-- 
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

Reply via email to