diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-11-27 13:56:09 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-11-27 16:14:06 +0100 |
| commit | ab8cba61c08571e4cbce1246bcbf820d3e337506 (patch) | |
| tree | 8d387ee84123810d3af75625aa817643c7be44b1 /ipaserver | |
| parent | dcaf57271c91f75733e42048683a04bde4ea9b2a (diff) | |
| download | freeipa-ab8cba61c08571e4cbce1246bcbf820d3e337506.tar.gz freeipa-ab8cba61c08571e4cbce1246bcbf820d3e337506.tar.xz freeipa-ab8cba61c08571e4cbce1246bcbf820d3e337506.zip | |
ipa-kra-install: error when replica file is passed with domain level > 0
installing kra on promoted replica (domain level > 0) does not require
replica file.
https://fedorahosted.org/freeipa/ticket/5455
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/ipa_kra_install.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py index 79b4ae899..643ad4031 100644 --- a/ipaserver/install/ipa_kra_install.py +++ b/ipaserver/install/ipa_kra_install.py @@ -169,10 +169,10 @@ class KRAInstaller(KRAInstall): self.options.promote = True elif not self.args: raise RuntimeError("A replica file is required.") - else: - if self.args: - raise RuntimeError("Too many parameters provided. " - "No replica file is required.") + + if self.args and (not self.installing_replica or self.options.promote): + raise RuntimeError("Too many parameters provided. " + "No replica file is required.") self.options.dm_password = self.options.password self.options.setup_ca = False |