From db8027407a1ef021d23ca0e8b38609a0a1805c08 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 16 Jul 2013 13:23:59 +0200 Subject: test_integration: Set up CA on replicas by default For complex topologies the CA needs to be available on most replicas, since only servgers with a CA can prepare replica files. --- ipatests/test_integration/tasks.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 3285838c6..30252e3d8 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -150,7 +150,8 @@ def install_master(host): host.run_command(['kinit', 'admin'], stdin_text=host.config.admin_password) -def install_replica(master, replica): + +def install_replica(master, replica, setup_ca=True): replica.collect_log('/var/log/ipareplica-install.log') replica.collect_log('/var/log/ipareplica-conncheck.log') @@ -165,11 +166,15 @@ def install_replica(master, replica): replica_filename = os.path.join(replica.config.test_dir, 'replica-info.gpg') replica.put_file_contents(replica_filename, replica_bundle) - replica.run_command(['ipa-replica-install', '-U', - '-p', replica.config.dirman_password, - '-w', replica.config.admin_password, - '--ip-address', replica.ip, - replica_filename]) + args = ['ipa-replica-install', '-U', + '--setup-ca', + '-p', replica.config.dirman_password, + '-w', replica.config.admin_password, + '--ip-address', replica.ip, + replica_filename] + if setup_ca: + args.append('--setup-ca') + replica.run_command(args) enable_replication_debugging(replica) -- cgit