summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2017-03-07 17:44:17 +0100
committerDavid Kupka <dkupka@redhat.com>2017-03-08 15:50:30 +0100
commit25fa2bb6c9fa1b498330b13c9a6116b646eb75ba (patch)
tree2667ae7ce2e325a2863acfd609fe3f52e2432363
parent4006cbbc02c368ac9e5e3721613158decb34fd37 (diff)
downloadfreeipa-25fa2bb6c9fa1b498330b13c9a6116b646eb75ba.tar.gz
freeipa-25fa2bb6c9fa1b498330b13c9a6116b646eb75ba.tar.xz
freeipa-25fa2bb6c9fa1b498330b13c9a6116b646eb75ba.zip
tests: use --setup-kra in tests
This will allow to test --setup-kra option together with ipa-server-install in install tests Separate installation using ipa-kra-install is already covered. https://pagure.io/freeipa/issue/6731 Reviewed-By: Jan Cholasta <jcholast@redhat.com> Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
-rw-r--r--ipatests/test_integration/tasks.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index 6620d12c6..0f96f16ae 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -275,6 +275,8 @@ def install_master(host, setup_dns=True, setup_kra=False, setup_adtrust=False,
'--forwarder', host.config.dns_forwarder,
'--auto-reverse'
])
+ if setup_kra:
+ args.append('--setup-kra')
if setup_adtrust:
args.append('--setup-adtrust')
@@ -284,13 +286,6 @@ def install_master(host, setup_dns=True, setup_kra=False, setup_adtrust=False,
if result.returncode == 0:
enable_replication_debugging(host)
setup_sssd_debugging(host)
- if setup_kra:
- args = [
- "ipa-kra-install",
- "-p", host.config.dirman_password,
- "-U",
- ]
- host.run_command(args)
kinit_admin(host)
return result