From 814b42f61677de70a4286ddba5c4276918daeb16 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 4 Jul 2019 09:01:00 +1000 Subject: [PATCH] Set openafs cache sizes for mirror/mirror-update Set the openafs cache values to the same as the puppet set values for openafs-client role users. Change-Id: I5a58673cad8df2a1e8dddb592c322e751d7f2ac5 --- .zuul.yaml | 2 ++ playbooks/service-mirror-update.yaml | 1 + playbooks/service-mirror.yaml | 3 ++- playbooks/zuul/run-base.yaml | 1 + playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2 | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2 diff --git a/.zuul.yaml b/.zuul.yaml index ba2e566c1e..19b60960ea 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -550,10 +550,12 @@ - playbooks/service-mirror.yaml files: - roles/ + - playbooks/group_vars/mirror_opendev.yaml - playbooks/roles/mirror/ - playbooks/roles/letsencrypt.* - playbooks/service-letsencrypt.yaml - playbooks/service-mirror.yaml + - playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2 - testinfra/test_mirror.py host-vars: diff --git a/playbooks/service-mirror-update.yaml b/playbooks/service-mirror-update.yaml index 24865ca433..116a2c3350 100644 --- a/playbooks/service-mirror-update.yaml +++ b/playbooks/service-mirror-update.yaml @@ -8,4 +8,5 @@ - kdc03.openstack.org - kdc04.openstack.org - role: openafs-client + openafs_client_cache_size: "{{ afs_client_cache_size | default(10000000) }}" # 10GiB - role: mirror-update diff --git a/playbooks/service-mirror.yaml b/playbooks/service-mirror.yaml index ba6f0c59d6..0dae8db3a4 100644 --- a/playbooks/service-mirror.yaml +++ b/playbooks/service-mirror.yaml @@ -8,4 +8,5 @@ - kdc03.openstack.org - kdc04.openstack.org - role: openafs-client - - role: mirror \ No newline at end of file + openafs_client_cache_size: "{{ afs_client_cache_size | default(50000000) }}" # 50GiB + - role: mirror diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index 214eed680c..0d62619a40 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -81,6 +81,7 @@ - group_vars/letsencrypt.yaml - group_vars/registry.yaml - group_vars/control-plane-clouds.yaml + - group_vars/mirror_opendev.yaml - host_vars/bridge.openstack.org.yaml - host_vars/letsencrypt01.opendev.org.yaml - host_vars/letsencrypt02.opendev.org.yaml diff --git a/playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2 b/playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2 new file mode 100644 index 0000000000..4ddfa98633 --- /dev/null +++ b/playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2 @@ -0,0 +1 @@ +afs_client_cache_size: 500000 # 500MiB