Create mechanism to be able to add custom mount options to AFS shares

Applies to /sapmnt/<SID> and /hana/shared in HA/non-HA deployments

Author: Csaba Daradics

deploy/ansible/roles-sap-os/2.6-sap-mounts/tasks/2.6.0-afs-mounts.yaml

@@ -276,7 +276,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ afs_mnt_options }}{{ ',' ~ afs_mnt_extra_options if afs_mnt_extra_options is defined }}"
         state:                         mounted
       loop:
         - { type: 'nfs4',  src: '{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}',    path: '/sapmnt/{{ sap_sid | upper }}'      }
@@ -286,7 +286,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ afs_mnt_options }}{{ ',' ~ afs_mnt_extra_options if afs_mnt_extra_options is defined }}"
         state:                         unmounted
       loop:
         - { type: 'nfs4',  src: '{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}',    path: '/sapmnt/{{ sap_sid | upper }}'      }
@@ -303,7 +303,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ afs_mnt_options }}{{ ',' ~ afs_mnt_extra_options if afs_mnt_extra_options is defined }}"
         state:                         mounted
       loop:
         - { type: 'nfs4',  src: '{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}',    path: '/sapmnt/{{ sap_sid | upper }}'      }
@@ -427,7 +427,7 @@
       'type':              'shared',
       'temppath':          'shared',
       'mount':             "{% if site | default('SITE1') == 'SITE1' %}{{ hana_shared_mountpoint[0] }}{% else %}{{ hana_shared_mountpoint[1] }}{% endif %}",
-      'opts':              'vers=4,minorversion=1,sec=sys',
+      'opts':              '{{ afs_mnt_options }}{{ "," ~ afs_mnt_extra_options if afs_mnt_extra_options is defined }}',
       'path':              '/hana/shared',
       'owner':             '{{ sidadm_uid }}',
       'permissions':       '0775',
@@ -450,7 +450,7 @@
       'type':              'shared',
       'temppath':          'shared',
       'mount':             "{{ hana_shared_mountpoint[0] }}",
-      'opts':              'vers=4,minorversion=1,sec=sys',
+      'opts':              '{{ afs_mnt_options }}{{ "," ~ afs_mnt_extra_options if afs_mnt_extra_options is defined }}',
       'path':              '/hana/shared',
       'owner':             '{{ sidadm_uid }}',
       'permissions':       '0775',

deploy/ansible/roles-sap/5.8-hanadb-scaleout-pacemaker/tasks/5.8.4.0-clusterPrep-ScaleOut-RedHat.yml

@@ -18,7 +18,7 @@
 # We set this to prevent code overflow. Since pacemaker code for both AFS and ANF are the same barring NFS mount options, we parameterize this parameter.
 - name:                                "5.8 HANA Pacemaker Scaleout - NFS Compatibility - set mount options based on NFS source"
   ansible.builtin.set_fact:
-    nfs_mount_options:                 "{% if NFS_provider == 'ANF' %}defaults,rw,hard,rsize=262144,wsize=262144,proto=tcp,noatime,_netdev,nfsvers=4.1,lock,sec=sys{% else %}noresvport,defaults,rw,hard,proto=tcp,noatime,nfsvers=4.1,lock{% endif %}"
+    nfs_mount_options:                 "{% if NFS_provider == 'ANF' %}defaults,rw,hard,rsize=262144,wsize=262144,proto=tcp,noatime,_netdev,nfsvers=4.1,lock,sec=sys{% else %}noresvport,defaults,rw,hard,proto=tcp,noatime,nfsvers=4.1,lock{% if afs_mnt_extra_options is defined %},{{ afs_mnt_extra_options }}{% endif %}{% endif %}"
     directory_path:                    "{% if NFS_provider == 'ANF' %}/shared{% else %}{% endif %}"
 
   # Ref : https://learn.microsoft.com/en-us/azure/sap/workloads/sap-hana-high-availability-scale-out-hsr-rhel?tabs=lb-portal#create-file-system-resources