diff options
author | Oleg Fayans <ofayans@redhat.com> | 2016-03-08 12:08:08 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-03-11 17:27:45 +0100 |
commit | b5807fd9b646cf887f67d966d88e4ddcd09d1007 (patch) | |
tree | 95d956cbb059ab0f53bc81efb978ce5dc4db9d50 | |
parent | b4071c542f9fb8b2d97a731bc70d74ed8607dc58 (diff) | |
download | freeipa-b5807fd9b646cf887f67d966d88e4ddcd09d1007.tar.gz freeipa-b5807fd9b646cf887f67d966d88e4ddcd09d1007.tar.xz freeipa-b5807fd9b646cf887f67d966d88e4ddcd09d1007.zip |
Made apply_common_fixes call at replica installation independent on domain_level
Besides added obligatory domain/realm-specific commandline options
to replica installation
https://fedorahosted.org/freeipa/ticket/5723
Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r-- | ipatests/test_integration/tasks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 3428a065b..1d6846a05 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -296,7 +296,6 @@ def master_authoritative_for_client_domain(master, client): def replica_prepare(master, replica): - apply_common_fixes(replica) fix_apache_semaphores(replica) prepare_reverse_zone(master, replica.ip) args = ['ipa-replica-prepare', @@ -315,6 +314,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False, setup_kra=False, extra_args=(), domain_level=None): if domain_level is None: domain_level = domainlevel(master) + apply_common_fixes(replica) replica.collect_log(paths.IPAREPLICA_INSTALL_LOG) replica.collect_log(paths.IPAREPLICA_CONNCHECK_LOG) allow_sync_ptr(master) @@ -344,7 +344,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False, # install client on a replica machine and then promote it to replica install_client(master, replica) fix_apache_semaphores(replica) - + args.extend(['-r', replica.domain.realm]) replica.run_command(args) enable_replication_debugging(replica) setup_sssd_debugging(replica) |