From 3348d9b3d5d1fece6bac140a08e257a1d80f24fd Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 1 Dec 2020 15:28:30 -0500 Subject: [PATCH] testnode: Install and configure cachefilesd Fixes: https://tracker.ceph.com/issues/6373 Signed-off-by: David Galloway --- roles/testnode/README.rst | 19 +++++++++++++++++++ roles/testnode/defaults/main.yml | 3 +++ roles/testnode/tasks/cachefilesd.yaml | 15 +++++++++++++++ roles/testnode/tasks/main.yml | 5 +++++ roles/testnode/templates/cachefilesd.j2 | 9 +++++++++ 5 files changed, 51 insertions(+) create mode 100644 roles/testnode/tasks/cachefilesd.yaml create mode 100644 roles/testnode/templates/cachefilesd.j2 diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst index ffdbb50..f076d51 100644 --- a/roles/testnode/README.rst +++ b/roles/testnode/README.rst @@ -276,11 +276,30 @@ Downstream QE requested ABRT be configured in a certain way. Overridden in Octo configure_abrt: false +Configure ``cachefilesd``. See https://tracker.ceph.com/issues/6373. Defaults to ``false``:: + + configure_cachefilesd: true + + # Optionally override any of the following variables to change their + # corresponding values in /etc/cachefilesd.conf + cachefilesd_dir + cachefilesd_tag + cachefilesd_brun + cachefilesd_bcull + cachefilesd_bstop + cachefilesd_frun + cachefilesd_fcull + cachefilesd_fstop + cachefilesd_secctx + Tags ++++ Available tags are listed below: +cachefilesd + Install and configure cachefilesd. + cpan Install and configure cpan and Amazon::S3. diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml index b602d5e..c798f4cc 100644 --- a/roles/testnode/defaults/main.yml +++ b/roles/testnode/defaults/main.yml @@ -73,3 +73,6 @@ pip_packages_to_install: [] # Configure ABRT (probably only for downstream use) configure_abrt: false + +# Configure cachefilesd (https://tracker.ceph.com/issues/6373) +configure_cachefilesd: false diff --git a/roles/testnode/tasks/cachefilesd.yaml b/roles/testnode/tasks/cachefilesd.yaml new file mode 100644 index 0000000..382df59 --- /dev/null +++ b/roles/testnode/tasks/cachefilesd.yaml @@ -0,0 +1,15 @@ +--- +- name: Install cachefilesd + package: + name: cachefilesd + state: latest + +- name: Install cachefilesd conf file + template: + src: cachefilesd.j2 + dest: /etc/cachefilesd.conf + +- name: Restart cachefilesd + service: + name: cachefilesd + state: restarted diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index 545edc6..57c01bf 100644 --- a/roles/testnode/tasks/main.yml +++ b/roles/testnode/tasks/main.yml @@ -95,6 +95,11 @@ tags: - varlib +- import_tasks: cachefilesd.yaml + when: configure_cachefilesd|bool == true + tags: + - cachefilesd + # Install and configure cpan and Amazon::S3 - import_tasks: cpan.yml tags: diff --git a/roles/testnode/templates/cachefilesd.j2 b/roles/testnode/templates/cachefilesd.j2 new file mode 100644 index 0000000..d94765b --- /dev/null +++ b/roles/testnode/templates/cachefilesd.j2 @@ -0,0 +1,9 @@ +dir {{ cachefilesd_dir|default('/var/cache/fscache') }} +tag {{ cachefilesd_tag|default('mycache') }} +brun {{ cachefilesd_brun|default('10%') }} +bcull {{ cachefilesd_bcull|default('7%') }} +bstop {{ cachefilesd_bstop|default('3%') }} +frun {{ cachefilesd_frun|default('10%') }} +fcull {{ cachefilesd_fcull|default('7%') }} +fstop {{ cachefilesd_fstop|default('3%') }} +secctx {{ cachefilesd_secctx|default('system_u:system_r:cachefiles_kernel_t:s0') }} -- 2.39.5