From 074bf285f185d96d67cf9f410f1e8935078d15eb Mon Sep 17 00:00:00 2001 From: Sergey Orlov Date: Mon, 29 Jul 2019 11:07:59 +0200 Subject: [PATCH] ipatests: allow to pass additional options for clients installation Reviewed-By: Michal Polovka Reviewed-By: Alexander Bokovoy --- ipatests/pytest_ipa/integration/tasks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py index d09a67968..888272bb3 100644 --- a/ipatests/pytest_ipa/integration/tasks.py +++ b/ipatests/pytest_ipa/integration/tasks.py @@ -1221,7 +1221,7 @@ def double_circle_topo(master, replicas, site_size=6): def install_topo(topo, master, replicas, clients, domain_level=None, skip_master=False, setup_replica_cas=True, - setup_replica_kras=False): + setup_replica_kras=False, clients_extra_args=()): """Install IPA servers and clients in the given topology""" if setup_replica_kras and not setup_replica_cas: raise ValueError("Option 'setup_replica_kras' requires " @@ -1249,15 +1249,15 @@ def install_topo(topo, master, replicas, clients, domain_level=None, setup_kra=setup_replica_kras ) installed.add(child) - install_clients([master] + replicas, clients) + install_clients([master] + replicas, clients, clients_extra_args) -def install_clients(servers, clients): +def install_clients(servers, clients, extra_args=()): """Install IPA clients, distributing them among the given servers""" izip = getattr(itertools, 'izip', zip) for server, client in izip(itertools.cycle(servers), clients): logger.info('Installing client %s on %s', server, client) - install_client(server, client) + install_client(server, client, extra_args) def _entries_to_ldif(entries):