IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: use --setup-kra with replica installation

Browse Source 
Currently tests were not testing one-step installation of KRA together
with replica. Adding --setup-kra to replica installation instead of
calling ipa-kra-install after.

https://fedorahosted.org/freeipa/ticket/6088

Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
This commit is contained in:
Martin Basti 2016-10-11 18:33:08 +02:00
parent 84ca1fc220
commit 11d7b774c4
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipatests/test_integration/tasks.py
View File

@ -359,6 +359,9 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
args.append('-U') args.append('-U')
if setup_ca: if setup_ca:
args.append('--setup-ca') args.append('--setup-ca')
if setup_kra:
assert setup_ca, "CA must be installed on replica with KRA"
args.append('--setup-kra')
if setup_dns: if setup_dns:
args.extend([ args.extend([
'--setup-dns', '--setup-dns',
@ -388,17 +391,6 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
if result.returncode == 0: if result.returncode == 0:
enable_replication_debugging(replica) enable_replication_debugging(replica)
setup_sssd_debugging(replica) setup_sssd_debugging(replica)
if setup_kra:
assert setup_ca, "CA must be installed on replica with KRA"
args = [
"ipa-kra-install",
"-p", replica.config.dirman_password,
"-U",
]
if domainlevel(master) == DOMAIN_LEVEL_0:
args.append(replica_filename)
replica.run_command(args)
kinit_admin(replica) kinit_admin(replica)
return result return result