sit-test-cases: Modify test-info.yml to define all shares

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
samba-in-kubernetes · Aug 28, 2024 · 8d260b5 · 8d260b5
1 parent 4a62812
commit 8d260b5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/playbooks/ansible/roles/test.sit-test-cases/tasks/prepare/main.yml b/playbooks/ansible/roles/test.sit-test-cases/tasks/prepare/main.yml
@@ -31,7 +31,6 @@
  dest: /root/test-info.yml
  vars:
  public_interfaces: "{{ (config.be.variant == 'mgr') | ternary(node_network_public_interfaces, ctdb_network_public_interfaces) }}"
- sharenames: "{{ samba_shares | map(attribute='name') | list }}"
 
 - name: Create a symlink for test-info.yml file
  file:

diff --git a/playbooks/ansible/roles/test.sit-test-cases/templates/test-info.yml.j2 b/playbooks/ansible/roles/test.sit-test-cases/templates/test-info.yml.j2
@@ -13,10 +13,20 @@ users:
 backend: {{ config.be.name }}
 
 shares:
- {%- for share in sharenames +%}
- {{ share }}-{{ config.be.name }}-{{ config.be.variant }}:
+ {%- for share in samba_shares +%}
+ {%- if config.be.methods is defined +%}
+ {%- for method in config.be.methods +%}
+ {{ share.name }}-{{ config.be.name }}-{{ config.be.variant}}-{{ method }}:
  backend:
  name: {{ config.be.name }}
  variant: {{ config.be.variant}}
- path: {{ config.paths.mount }}/backends/{{ share }}
+ path: {{ config.paths.mount }}/backends/{{ share.name }}
+ {%- endfor +%}
+ {%- else +%}
+ {{ share.name }}-{{ config.be.name }}-{{ config.be.variant }}:
+ backend:
+ name: {{ config.be.name }}
+ variant: {{ config.be.variant}}
+ path: {{ config.paths.mount }}/backends/{{ share.name }}
+ {%- endif +%}
  {%- endfor +%}