summaryrefslogtreecommitdiffstats
path: root/ipaserver/install
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-12-14 15:15:44 +0100
committerTomas Babej <tbabej@redhat.com>2015-12-14 15:38:32 +0100
commit110e3dfc5401899ae0a54cc979ca0820e53cfa02 (patch)
tree9866794c3f5c515c0fea6ca88d1256df986a989e /ipaserver/install
parent4272ba40ea909b1f783a6fada5b1eebb6efbdf93 (diff)
downloadfreeipa-110e3dfc5401899ae0a54cc979ca0820e53cfa02.tar.gz
freeipa-110e3dfc5401899ae0a54cc979ca0820e53cfa02.tar.xz
freeipa-110e3dfc5401899ae0a54cc979ca0820e53cfa02.zip
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 <tbabej@redhat.com>
Diffstat (limited to 'ipaserver/install')
-rw-r--r--ipaserver/install/server/replicainstall.py9
1 files changed, 0 insertions, 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: