From 110e3dfc5401899ae0a54cc979ca0820e53cfa02 Mon Sep 17 00:00:00 2001 From: Jan Cholasta 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 Reviewed-By: Tomas Babej --- 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 c6927a5d9..4e6abde0e 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: