From 6b67d05f670d8ac595c11ab98e6912d63fae6e59 Mon Sep 17 00:00:00 2001 From: Sachin Prabhu Date: Thu, 2 May 2024 17:17:41 +0100 Subject: [PATCH] client-prep: add path to backend to test-info.yml Access to the backend filesystem is already provided through sshfs. Make sure that this is listed in test-info.yml allowing the testing infrastructure to prepare the backend for a test. Signed-off-by: Sachin Prabhu --- playbooks/ansible/roles/client.prep/tasks/main.yml | 4 +--- .../ansible/roles/client.prep/templates/test-info.yml.j2 | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/ansible/roles/client.prep/tasks/main.yml b/playbooks/ansible/roles/client.prep/tasks/main.yml index ee7783b..12db9aa 100644 --- a/playbooks/ansible/roles/client.prep/tasks/main.yml +++ b/playbooks/ansible/roles/client.prep/tasks/main.yml @@ -33,7 +33,5 @@ dest: /root/test-info.yml vars: public_interfaces: "{{ ctdb_network_public_interfaces }}" - exported_sharenames: >- - {{ samba_shares | map(attribute='name') | - map('regex_replace', '$', '-' + config.be.name + '-' + config.be.variant) | list }} + sharenames: "{{ samba_shares | map(attribute='name') | list }}" test_backend: "{{ config.be.name }}" diff --git a/playbooks/ansible/roles/client.prep/templates/test-info.yml.j2 b/playbooks/ansible/roles/client.prep/templates/test-info.yml.j2 index bb1719b..40d789c 100644 --- a/playbooks/ansible/roles/client.prep/templates/test-info.yml.j2 +++ b/playbooks/ansible/roles/client.prep/templates/test-info.yml.j2 @@ -13,7 +13,9 @@ users: backend: {{ test_backend }} shares: - {%- for share in exported_sharenames +%} - {{ share }}: + {%- for share in sharenames +%} + {{ share }}-{{ config.be.name }}-{{ config.be.variant }}: + backend: + path: {{ config.paths.mount }}/backends/{{ share }} {%- endfor +%}