summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
authorJames E. Blair <jim@acmegating.com>2021-02-24 16:57:49 -0800
committerJames E. Blair <jim@acmegating.com>2021-03-08 06:49:57 -0800
commit74a9c9de9b52b75b7286b7e4873667517b390446 (patch)
tree34d2ef737720e9d1c575d35dce5ed20a22fd3f7f /playbooks
parentfa2175c22a0799401c0f9983751e08955793a964 (diff)
downloadzuul-74a9c9de9b52b75b7286b7e4873667517b390446.tar.gz
Use ZooKeeper TLS in tests
This mirrors the configuration in Nodepool for using TLS-enabled ZooKeeper in tests. We use the ensure-zookeeper role in order to get a newer ZooKeeper than is supplied in bionic. Change-Id: I14413fccbc9a6a7a75b6233d667e2a1d2856d894
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/post-system-logs.yaml5
-rw-r--r--playbooks/zuul-tox/post-system-logs.yaml5
-rw-r--r--playbooks/zuul-tox/pre.yaml4
3 files changed, 9 insertions, 5 deletions
diff --git a/playbooks/common/post-system-logs.yaml b/playbooks/common/post-system-logs.yaml
deleted file mode 100644
index 830899c38..000000000
--- a/playbooks/common/post-system-logs.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- hosts: all
- tasks:
-
- - name: Collect zookeeper logs
- shell: "cp /var/log/zookeeper/zookeeper.log {{ zuul_output_dir }}/logs/zookeeper.log"
diff --git a/playbooks/zuul-tox/post-system-logs.yaml b/playbooks/zuul-tox/post-system-logs.yaml
new file mode 100644
index 000000000..7a9da4821
--- /dev/null
+++ b/playbooks/zuul-tox/post-system-logs.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+ tasks:
+
+ - name: Collect zookeeper logs
+ shell: "cp /opt/zookeeper/logs/* {{ zuul_output_dir }}/logs/"
diff --git a/playbooks/zuul-tox/pre.yaml b/playbooks/zuul-tox/pre.yaml
new file mode 100644
index 000000000..45d213e97
--- /dev/null
+++ b/playbooks/zuul-tox/pre.yaml
@@ -0,0 +1,4 @@
+- hosts: all
+ roles:
+ - role: ensure-zookeeper
+ zookeeper_use_tls: true