sap_hana_preconfigure: modify version string for SAP note 3024346

Signed-off-by: Bernd Finger <[email protected]>
berndfinger · Jul 19, 2024 · 64ff781 · 64ff781
1 parent 6b962bf
commit 64ff781
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 28 deletions.
diff --git a/roles/sap_hana_preconfigure/README.md b/roles/sap_hana_preconfigure/README.md
@@ -326,13 +326,6 @@ Network related linux kernel parameter settings for platform ppc64le.<br>
 
 Set to `true` to also set NetApp NFS required kernel parameters.<br>
 
-### sap_hana_preconfigure_use_netapp_settings_nfsv3
-- _Type:_ `bool`
-- _Default:_ `false`
-
-If `sap_hana_preconfigure_use_netapp_settings_nfs` is set to `true` and NFS Version 3 is to be used,<br>
-this parameter must be set to `true` as well.<br>
-
 ### sap_hana_preconfigure_install_ibm_power_tools
 - _Type:_ `bool`
 - _Default:_ `true`

diff --git a/roles/sap_hana_preconfigure/defaults/main.yml b/roles/sap_hana_preconfigure/defaults/main.yml
@@ -130,10 +130,6 @@ sap_hana_preconfigure_kernel_parameters_ppc64le: "{{ __sap_hana_preconfigure_ker
 sap_hana_preconfigure_use_netapp_settings_nfs: false
 # Set to `true` to also set NetApp NFS required kernel parameters.
 
-sap_hana_preconfigure_use_netapp_settings_nfsv3: false
-# If `sap_hana_preconfigure_use_netapp_settings_nfs` is set to `true` and NFS Version 3 is to be used,
-# this parameter must be set to `true` as well.
-
 sap_hana_preconfigure_install_ibm_power_tools: true
 # Set this parameter to `false` to not install the IBM Power Systems service and productivity tools.
 

diff --git a/roles/sap_hana_preconfigure/meta/argument_specs.yml b/roles/sap_hana_preconfigure/meta/argument_specs.yml
@@ -273,14 +273,6 @@ argument_specs:
         required: false
         type: bool
 
-      sap_hana_preconfigure_use_netapp_settings_nfsv3:
-        default: false
-        description:
-          - If `sap_hana_preconfigure_use_netapp_settings_nfs` is set to `true` and NFS Version 3 is to be used,
-          - this parameter must be set to `true` as well.
-        required: false
-        type: bool
-
       sap_hana_preconfigure_install_ibm_power_tools:
         default: true
         description:

diff --git a/roles/sap_hana_preconfigure/tasks/sapnote/3024346.yml b/roles/sap_hana_preconfigure/tasks/sapnote/3024346.yml
@@ -66,11 +66,10 @@
       ansible.builtin.debug:
         var: __sap_hana_preconfigure_register_netapp_sysctl_p_output_new.stdout_lines
 
-    - name: Set kernel tunable for NFSv3 as per SAP note 3024346
+    - name: Set kernel tunable 'tcp_max_slot_table_entries' to '128' in file '/etc/modprobe.d/sunrpc.conf'
       ansible.builtin.lineinfile:
         path: /etc/modprobe.d/sunrpc.conf
-        create: yes
+        create: true
         mode: 0644
         regexp: '^options sunrpc tcp_max_slot_table_entries'
         line: options sunrpc tcp_max_slot_table_entries=128
-      when: sap_hana_preconfigure_use_netapp_settings_nfsv3
diff --git a/roles/sap_hana_preconfigure/vars/RedHat_7.yml b/roles/sap_hana_preconfigure/vars/RedHat_7.yml
@@ -45,14 +45,14 @@ __sap_hana_preconfigure_sapnotes_versions_x86_64:
   - { number: '2009879', version: '28' }
   - { number: '2292690', version: '38' }
   - { number: '2382421', version: '40' }
-  - { number: '3024346', version: '3' }
+  - { number: '3024346', version: '10' }
 
 __sap_hana_preconfigure_sapnotes_versions_ppc64le:
   - { number: '2009879', version: '28' }
   - { number: '2055470', version: '85' }
   - { number: '2292690', version: '38' }
   - { number: '2382421', version: '40' }
-  - { number: '3024346', version: '3' }
+  - { number: '3024346', version: '10' }
 
 __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_preconfigure_sapnotes_versions_' + ansible_architecture) }}"
 

diff --git a/roles/sap_hana_preconfigure/vars/RedHat_8.yml b/roles/sap_hana_preconfigure/vars/RedHat_8.yml
@@ -125,13 +125,13 @@ __sap_hana_preconfigure_req_repos_redhat_8_10_ppc64le:
 __sap_hana_preconfigure_sapnotes_versions_x86_64:
   - { number: '2777782', version: '40' }
   - { number: '2382421', version: '40' }
-  - { number: '3024346', version: '3' }
+  - { number: '3024346', version: '10' }
 
 __sap_hana_preconfigure_sapnotes_versions_ppc64le:
   - { number: '2055470', version: '87' }
   - { number: '2777782', version: '40' }
   - { number: '2382421', version: '40' }
-  - { number: '3024346', version: '3' }
+  - { number: '3024346', version: '10' }
 
 __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_preconfigure_sapnotes_versions_' + ansible_architecture) }}"
 

diff --git a/roles/sap_hana_preconfigure/vars/RedHat_9.yml b/roles/sap_hana_preconfigure/vars/RedHat_9.yml
@@ -122,13 +122,13 @@ __sap_hana_preconfigure_req_repos_redhat_9_10_ppc64le:
 __sap_hana_preconfigure_sapnotes_versions_x86_64:
   - { number: '3108302', version: '9' }
   - { number: '2382421', version: '45' }
-  - { number: '3024346', version: '3' }
+  - { number: '3024346', version: '10' }
 
 __sap_hana_preconfigure_sapnotes_versions_ppc64le:
   - { number: '2055470', version: '90' }
   - { number: '3108302', version: '9' }
   - { number: '2382421', version: '45' }
-  - { number: '3024346', version: '3' }
+  - { number: '3024346', version: '10' }
 
 __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_preconfigure_sapnotes_versions_' + ansible_architecture) }}"