summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-07-16 13:23:59 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-07-25 12:32:33 +0200
commitdb8027407a1ef021d23ca0e8b38609a0a1805c08 (patch)
tree5a10dd0db1b3094a79e7ae30c5b78110c9f3999a
parent4b439356b735d55c7da664bdf8d9f40468fb9c4d (diff)
downloadfreeipa.git-db8027407a1ef021d23ca0e8b38609a0a1805c08.tar.gz
freeipa.git-db8027407a1ef021d23ca0e8b38609a0a1805c08.tar.xz
freeipa.git-db8027407a1ef021d23ca0e8b38609a0a1805c08.zip
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.
-rw-r--r--ipatests/test_integration/tasks.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index 3285838c..30252e3d 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)