From aeeac20c290f786ba4af21a4f9fbb0e8dcdde75d Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@cryptolab.net>
Date: Wed, 25 Sep 2024 14:49:40 +0530
Subject: [PATCH 1/2] sit.cephfs: Enable clustering for mgr variant

Clustering support is now available when configured using smb mgr
module. Let's enable clustering always for mgr module based setup.

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
---
 .../roles/sit.cephfs/templates/ceph.smb.cluster.yml.j2     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.cluster.yml.j2 b/playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.cluster.yml.j2
index ffa72a9..2460941 100644
--- a/playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.cluster.yml.j2
+++ b/playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.cluster.yml.j2
@@ -36,4 +36,9 @@ resources:
     - source_type: resource
       ref: siteacct
   placement:
-    hosts: [ {{ inventory_hostname }} ]
+    count: {{ config.groups['cluster'] | length }}
+  clustering: always
+  public_addrs:
+    {%- for addr in ctdb_network_public_interfaces +%}
+    - address: {{ addr }}/{{ ctdb_network_public_interface_subnet_mask }}
+    {%- endfor +%}

From 05c4561fc7b2deeec547f612f7b78c8b130b0fe4 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@cryptolab.net>
Date: Wed, 25 Sep 2024 14:56:38 +0530
Subject: [PATCH 2/2] Revert "test-info: Update node ip running smb service"

This reverts commit b0e5af7a8730786530a3386670cc59dbd19c18e9.

Node ip address was only required for mgr variant in the absence of
clustering support.
---
 playbooks/ansible/cluster-cephfs.yml                     | 9 ---------
 .../roles/test.sit-test-cases/tasks/prepare/main.yml     | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/playbooks/ansible/cluster-cephfs.yml b/playbooks/ansible/cluster-cephfs.yml
index 9e82784..c0fb0bc 100644
--- a/playbooks/ansible/cluster-cephfs.yml
+++ b/playbooks/ansible/cluster-cephfs.yml
@@ -1,13 +1,4 @@
 ---
-node_network_public_interfaces: >-
-  {{
-    config.nodes |
-    dict2items |
-    selectattr('value.groups', 'contains', 'cluster') |
-    map(attribute='value.networks.public') |
-    list
-  }}
-
 ctdb_network_private_interfaces: >-
   {{
     config.nodes |
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
index 22fcd22..2f621cc 100644
--- a/playbooks/ansible/roles/test.sit-test-cases/tasks/prepare/main.yml
+++ b/playbooks/ansible/roles/test.sit-test-cases/tasks/prepare/main.yml
@@ -30,7 +30,7 @@
     src: test-info.yml.j2
     dest: /root/test-info.yml
   vars:
-    public_interfaces: "{{ (config.be.variant == 'mgr') | ternary(node_network_public_interfaces, ctdb_network_public_interfaces) }}"
+    public_interfaces: "{{ ctdb_network_public_interfaces }}"
 
 - name: Create a symlink for test-info.yml file
   file: