summaryrefslogtreecommitdiffstats
path: root/ipatests/test_integration
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-09-24 16:31:39 +0200
committerMartin Kosek <mkosek@redhat.com>2014-09-30 08:50:47 +0200
commit3aa0731fc660ea3d111a44926ab5dea71dc510e7 (patch)
treec4ce2ba7de1163ce699d7fb65ce19bf30e86aa68 /ipatests/test_integration
parent60ecba77cd98f37be0d2c0f69efd307a687e59dc (diff)
downloadfreeipa-3aa0731fc660ea3d111a44926ab5dea71dc510e7.tar.gz
freeipa-3aa0731fc660ea3d111a44926ab5dea71dc510e7.tar.xz
freeipa-3aa0731fc660ea3d111a44926ab5dea71dc510e7.zip
External CA installer options usability fixes
The --external_cert_file and --external_ca_file options of ipa-server-install and ipa-ca-install have been replaced by --external-cert-file option which accepts multiple files. The files are accepted in PEM and DER certificate and PKCS#7 certificate chain formats. https://fedorahosted.org/freeipa/ticket/4480 Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipatests/test_integration')
-rw-r--r--ipatests/test_integration/test_external_ca.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipatests/test_integration/test_external_ca.py b/ipatests/test_integration/test_external_ca.py
index 747990cff..fbffdf14b 100644
--- a/ipatests/test_integration/test_external_ca.py
+++ b/ipatests/test_integration/test_external_ca.py
@@ -97,8 +97,8 @@ class TestExternalCA(IntegrationTest):
'ipa-server-install',
'-a', self.master.config.admin_password,
'-p', self.master.config.dirman_password,
- '--external_cert_file', external_cert_file,
- '--external_ca_file', external_ca_file
+ '--external-cert-file', external_cert_file,
+ '--external-cert-file', external_ca_file
])
# Make sure IPA server is working properly