diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-10-11 18:33:08 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-10-26 15:06:36 +0200 |
| commit | 11d7b774c4d731896e3ab6109b6ed7d5524c1bec (patch) | |
| tree | e8d8aaee6b6aa7654c3e9580c2134d6296ff5f46 /ipatests/test_integration | |
| parent | 84ca1fc220c329b58fb6a22c8eb9bf17d3622c55 (diff) | |
| download | freeipa-11d7b774c4d731896e3ab6109b6ed7d5524c1bec.tar.gz freeipa-11d7b774c4d731896e3ab6109b6ed7d5524c1bec.tar.xz freeipa-11d7b774c4d731896e3ab6109b6ed7d5524c1bec.zip | |
CI: use --setup-kra with replica installation
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>
Diffstat (limited to 'ipatests/test_integration')
| -rw-r--r-- | ipatests/test_integration/tasks.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index ef5078b87..df5e40891 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -359,6 +359,9 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False, args.append('-U') if 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: args.extend([ '--setup-dns', @@ -388,17 +391,6 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False, if result.returncode == 0: enable_replication_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) return result |