Merge pull request #24 from sap-linuxlab/dev

release: merge dev to main for 1.0.3

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml

@@ -180,7 +180,7 @@ sap_swpm_templates_install_dictionary:
       - 'SAPEXEDB_51-70007806.SAR' # Kernel Part II (785), SAP HANA 2.0
       - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22
       - 'BW4HANA400_INST_EXPORT_1.zip'
-      - '19118000000000009027'
+      - 'BW4HANA400_INST_EXPORT_2.zip'
       - 'BW4HANA400_INST_EXPORT_3.zip'
       - 'BW4HANA400_INST_EXPORT_4.zip'
       - 'BW4HANA400_INST_EXPORT_5.zip'
@@ -202,7 +202,7 @@ sap_swpm_templates_install_dictionary:
       - 'SAPEXEDB_51-70007806.SAR' # Kernel Part II (785), SAP HANA 2.0
       - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22
       - 'BW4HANA400_INST_EXPORT_1.zip'
-      - '19118000000000009027'
+      - 'BW4HANA400_INST_EXPORT_2.zip'
       - 'BW4HANA400_INST_EXPORT_3.zip'
       - 'BW4HANA400_INST_EXPORT_4.zip'
       - 'BW4HANA400_INST_EXPORT_5.zip'
@@ -300,20 +300,24 @@ sap_vm_provision_aws_ec2_vs_host_os_image_dictionary:
   rhel-8-2: "*RHEL-8.2*_HVM*x86_64*"
   rhel-8-4: "*RHEL-8.4*_HVM*x86_64*"
   rhel-8-6: "*RHEL-8.6*_HVM*x86_64*"
-  rhel-7-7-sap-ha: "*RHEL-SAP-7.7*"
-  rhel-7-9-sap-ha: "*RHEL-SAP-7.9*"
+  rhel-8-8: "*RHEL-8.8*_HVM*x86_64*"
   rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*"
   rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*"
   rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*"
   rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*"
+  rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*"
+  rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*"
+  rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*"
   sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*"
   sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*"
   sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*"
+  sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*"
   sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*"
   sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*"
   sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*"
   sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*"
   sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*"
+  sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*"
 
 
 sap_vm_provision_aws_ec2_vs_host_specifications_dictionary:
@@ -322,7 +326,7 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary:
 
     bw4h01: # Hostname, must be 13 characters or less
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
-      virtual_machine_profile: "r5.8xlarge"
+      virtual_machine_profile: "r7i.8xlarge" # 32 vCPU x 256GB DRAM
       disable_ip_anti_spoofing: true
 
       sap_storage_setup_sid: "{{ sap_system_sid }}"
@@ -377,7 +381,8 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary:
           disk_size: 80                 # size in GB, integer
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
           disk_size: 96
           filesystem_type: swap          # must be swap filesystem
 
@@ -397,14 +402,6 @@ sap_vm_provision_gcp_ce_vm_host_os_image_dictionary:
     project: "rhel-cloud"
     family: "rhel-8"
 
-  rhel-7-7-sap-ha:
-    project: "rhel-sap-cloud"
-    family: "rhel-7-7-sap-ha"
-
-  rhel-7-9-sap-ha:
-    project: "rhel-sap-cloud"
-    family: "rhel-7-9-sap-ha"
-
   rhel-8-1-sap-ha:
     project: "rhel-sap-cloud"
     family: "rhel-8-1-sap-ha"
@@ -444,7 +441,7 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary:
 
     bw4h01: # Hostname, must be 13 characters or less
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
-      virtual_machine_profile: "n2-highmem-32"
+      virtual_machine_profile: "n2-highmem-32" # 32 vCPU x 256GB DRAM
       disable_ip_anti_spoofing: true
 
       sap_storage_setup_sid: "{{ sap_system_sid }}"
@@ -492,9 +489,10 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary:
           disk_type: pd-balanced
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
-          swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 2
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 96
+          disk_type: pd-balanced
           filesystem_type: swap          # must be swap filesystem
 
         - name: software
@@ -513,9 +511,12 @@ sap_vm_provision_ibmcloud_vs_host_os_image_dictionary:
   rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*"
   rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*"
   rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*"
-  rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*"
+  rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*"
   rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*"
   rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*"
+  rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*"
+  rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*"
+  rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*"
   sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*"
   sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*"
   sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*"
@@ -527,7 +528,7 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary:
 
     bw4h01: # Hostname, must be 13 characters or less
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
-      virtual_machine_profile: "bx2-32x128"
+      virtual_machine_profile: "mx2-32x256" # 32 vCPU x 256GB DRAM
       disable_ip_anti_spoofing: true
 
       sap_storage_setup_sid: "{{ sap_system_sid }}"
@@ -587,9 +588,10 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary:
           disk_type: general-purpose
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
-          swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 2
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 96
+          disk_type: general-purpose
           filesystem_type: swap          # must be swap filesystem
 
         - name: software
@@ -606,16 +608,17 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary:
 
 # Full Linux subscription ppc64le OS Images with support and activation keys
 sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
-  rhel-8-4: ".*RHEL.*8.*4"
   rhel-8-6: ".*RHEL.*8.*6"
+  rhel-8-8: ".*RHEL.*8.*8"
   rhel-9-2: ".*RHEL.*9.*2"
-  sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
+  sles-15-5: ".*SLES.*15.*5"
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
-  sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
+  sles-15-5-sap-ha: ".*SLES.*15.*5.*SAP$" # ensure string suffix using $
 
 
 sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
@@ -624,7 +627,8 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
     bw4h01: # Hostname, must be 13 characters or less
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
-      virtual_machine_profile: "ush1-4x256" # alt: use custom SAP instance profile sizes using cnp-2x16 (2 Power Cores [16 vCPU] x 16GB) and above
+      virtual_machine_profile: "ush1-4x256" # 32 vCPU x 256GB DRAM, alt: use custom SAP instance profile sizes using cnp-2x16 (2 Power Cores [16 vCPU] x 16GB) and above
+      ibmcloud_powervs_hardware_machine_type: e980 # IBM Power hardware machine type (MT) used to host the Virtual Machine
       disable_ip_anti_spoofing: true
 
       sap_storage_setup_sid: "{{ sap_system_sid }}"
@@ -671,9 +675,9 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
           disk_type: tier1               # Does NOT use Burst IOPS storage. Approx same cost as 1TB at lower IOPS Tiers, use lower capacity and increase to 10IOPS/GB to ensure quicker DB Backup Restore from /hana/shared/<system_id>/HDB<instance_no>/backup/data/DB_<suffix>
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
-          swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 2
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 96
           disk_type: tier3
           filesystem_type: swap          # must be swap filesystem
 
@@ -711,6 +715,26 @@ sap_vm_provision_msazure_vm_host_os_image_dictionary:
     offer: "RHEL-SAP-HA"
     sku: "84sapha-gen2"
 
+  rhel-8-6-sap-ha:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-HA"
+    sku: "86sapha-gen2"
+
+  rhel-8-8-sap-ha:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-HA"
+    sku: "88sapha-gen2"
+
+  rhel-9-0-sap-ha:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-HA"
+    sku: "90sapha-gen2"
+
+  rhel-9-2-sap-ha:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-HA"
+    sku: "92sapha-gen2"
+
   rhel-8-1-sap-applications:
     publisher: "RedHat"
     offer: "RHEL-SAP-HA"
@@ -726,6 +750,26 @@ sap_vm_provision_msazure_vm_host_os_image_dictionary:
     offer: "RHEL-SAP-HA"
     sku: "84sapapps-gen2"
 
+  rhel-8-6-sap-applications:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-applications"
+    sku: "86sapapps-gen2"
+
+  rhel-8-8-sap-applications:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-applications"
+    sku: "88sapapps-gen2"
+
+  rhel-9-0-sap-applications:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-applications"
+    sku: "90sapapps-gen2"
+
+  rhel-9-2-sap-applications:
+    publisher: "RedHat"
+    offer: "RHEL-SAP-applications"
+    sku: "92sapapps-gen2"
+
   sles-15-sp3-sap:
     publisher: "SUSE"
     offer: "sles-sap-15-sp3"
@@ -748,7 +792,7 @@ sap_vm_provision_msazure_vm_host_specifications_dictionary:
 
     bw4h01: # Hostname, must be 13 characters or less
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
-      virtual_machine_profile: "Standard_M32ls"
+      virtual_machine_profile: "Standard_M32ls" # 32 vCPU x 256GB DRAM
       disable_ip_anti_spoofing: true
 
       sap_storage_setup_sid: "{{ sap_system_sid }}"
@@ -797,10 +841,11 @@ sap_vm_provision_msazure_vm_host_specifications_dictionary:
           filesystem_type: xfs           # default: xfs
 
         # MS Azure rootvg-rootlv / has only 2GB, therefore create virtual disk to avoid failures
-        - name: swap
-          #swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 4                 # size in GB, integer
-          disk_type: P1
+        # Use closest Azure Managed Disk Premium SSD type to 96GB
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 64                  # size in GB, integer
+          disk_type: P6
           filesystem_type: swap          # must be swap filesystem
 
         - name: software
@@ -866,9 +911,9 @@ sap_vm_provision_ibmpowervm_vm_host_specifications_dictionary:
           disk_size: 256                 # size in GB, integer
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
-          swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 2                   # size in GB, integer
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 96
           filesystem_type: swap          # must be swap filesystem
 
         - name: software
@@ -934,9 +979,9 @@ sap_vm_provision_ovirt_vm_host_specifications_dictionary:
           disk_size: 256                 # size in GB, integer
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
-          swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 2                   # size in GB, integer
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 96
           filesystem_type: swap          # must be swap filesystem
 
         - name: software
@@ -1007,9 +1052,10 @@ sap_vm_provision_vmware_vm_host_specifications_dictionary:
           disk_type: scsi                # VMware Virtual Disk Node (scsi, ide, sata)
           filesystem_type: xfs           # default: xfs
 
-        - name: swap
-          swap_path: /swapfile           # use swap file on root disk, instead of creating LVM LV for swap
-          disk_size: 2                   # size in GB, integer
+        # See SAP Note 1597355 - Swap-space recommendation for Linux
+        - name: swap # sbx
+          disk_size: 96
+          disk_type: scsi                # VMware Virtual Disk Node (scsi, ide, sata)
           filesystem_type: swap          # must be swap filesystem
 
         - name: software

deploy_scenarios/sap_bw4hana_sandbox/ansible_playbook.yml

@@ -62,7 +62,7 @@
       ansible.builtin.add_host:
         name: "{{ item }}"
         group: sap_vm_provision_target_inventory_group
-      loop: "{{ vars['sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary'][sap_vm_provision_host_specification_plan].keys() }}"
+      loop: "{{ lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() }}"
       when: sap_vm_provision_iac_type == "ansible" or sap_vm_provision_iac_type == "ansible_to_terraform"
 
 - name: Ansible Play to provision hosts for SAP

deploy_scenarios/sap_bw4hana_sandbox/ansible_requirements.yml

@@ -17,7 +17,7 @@ collections:
     version: 1.1.0
   - name: community.sap_infrastructure
     type: galaxy
-    version: 1.0.0
+    version: 1.0.1
 #  - name: community.sap_operations
 #    type: galaxy
 #    version: 0.9.1
@@ -34,7 +34,7 @@ collections:
     version: 7.1.0
   - name: azure.azcollection
     type: galaxy
-    version: 1.15.0
+    version: 2.2.0
   - name: google.cloud
     type: galaxy
     version: 1.1.3

deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_extravars_noninteractive.yml

@@ -102,6 +102,7 @@ sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ibmcloud_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VALUE_HERE" # comma-separated, if ansible_to_terraform then ignore this variable
+# sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name
 
 
 ####
@@ -126,6 +127,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE"
+# sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name
 sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix
 sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}"
 
@@ -155,7 +157,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE"
-sap_vm_provision_ssh_host_public_key_file_path: "ENTER_STRING_VALUE_HERE"
+sap_vm_provision_msazure_key_pair_name_ssh_host_public_key: ""
+# sap_vm_provision_msazure_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_msazure_resource_group_name
 
 
 ####