v1.6.0 release

IBM-Cloud · Mar 27, 2024 · 9a0b0a6 · 9a0b0a6
1 parent dbceedf
commit 9a0b0a6
Show file tree

Hide file tree

Showing 70 changed files with 1,581 additions and 440 deletions.
diff --git a/README.md b/README.md
diff --git a/ansible/roles/s4appfs/defaults/main.yml b/ansible/roles/s4appfs/defaults/main.yml
@@ -0,0 +1,41 @@
+---
+#Disk size config
+sap_disk_size: "128.00 GB"
+swap_disk_size: "40.00 GB"
+
+#Logical volume size config
+# swap_lv_size: "30g"
+usrsap_lv_size: "5g"
+sap_lv_size: "20g"
+sapmnt_lv_size: "20g"
+saptrans_lv_size: "50g"
+
+swap_lv:
+  - size: 38
+    ram_min: 32
+    ram_max: 63
+  - size: 38
+    ram_min: 64
+    ram_max: 127
+  - size: 38
+    ram_min: 128
+    ram_max: 255
+  - size: 38
+    ram_min: 256
+    ram_max: 511
+  - size: 38
+    ram_min: 512
+    ram_max: 1023
+  - size: 224
+    ram_min: 1024
+    ram_max: 2047
+  - size: 38
+    ram_min: 2048
+    ram_max: 4095
+  - size: 288
+    ram_min: 4096
+    ram_max: 8191
+  - size: 38
+    ram_min: 8192
+    ram_max: 20000
+...
diff --git a/...preq/tasks/configurations/filesystems.yml → ansible/roles/s4appfs/tasks/main.yml b/...preq/tasks/configurations/filesystems.yml → ansible/roles/s4appfs/tasks/main.yml
@@ -64,7 +64,6 @@
 
 - name: Get the swap logical volume size for RAM higher than 8192
   set_fact:
-    # swap_lv_size: "320g"
     swap_lv_size: "32g"
   when: app_ram | int >= 8192
 

diff --git a/ansible/roles/s4appinst/defaults/main.yml b/ansible/roles/s4appinst/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 #Sapinst product-id
-sap_product_id: "NW_ABAP_OneHost:S4HANA2020.CORE.HDB.ABAP"
+sap_product_id: "NW_ABAP_OneHost:S4HANA{{ s4hana_version }}.CORE.HDB.ABAP"
 
 #Target files location
 s4app_kit: "/usr/sap/trans/kit"

diff --git a/ansible/roles/s4appinst/tasks/main.yml b/ansible/roles/s4appinst/tasks/main.yml
@@ -4,7 +4,7 @@
 
 - name: Generate parameter file for sapinst
   template:
-      src: sapinst.cfg
+      src: sapinst_{{ s4hana_version }}.cfg
       dest: "{{ s4app_kit }}/inifile.params"
 
 - name: Check if S/4HANA Application Server was already installed

diff --git a/...ble/roles/s4appinst/templates/sapinst.cfg → ...oles/s4appinst/templates/sapinst_2020.cfg b/...ble/roles/s4appinst/templates/sapinst.cfg → ...oles/s4appinst/templates/sapinst_2020.cfg