From 92f45da487c4ad06cf6f6d4f245067fd19d1a08d Mon Sep 17 00:00:00 2001
From: sean-freeman <1815807+sean-freeman@users.noreply.github.com>
Date: Sun, 28 Apr 2024 13:20:31 +0100
Subject: [PATCH 1/2] all: update ibmcloud powervs hardware machine type opt

---
 deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml  | 1 +
 .../sap_bw4hana_standard_scaleout/ansible_extravars.yml     | 2 ++
 deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml | 1 +
 deploy_scenarios/sap_hana/ansible_extravars.yml             | 1 +
 deploy_scenarios/sap_hana_ha/ansible_extravars.yml          | 2 ++
 deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml    | 1 +
 .../sap_ides_ecc_hana_sandbox/ansible_extravars.yml         | 1 +
 deploy_scenarios/sap_landscape_s4hana_standard/README.md    | 2 ++
 .../sap_landscape_s4hana_standard/ansible_extravars.yml     | 6 ++++++
 .../sap_landscape_s4hana_standard_maintplan/README.md       | 2 ++
 .../ansible_extravars.yml                                   | 6 ++++++
 .../sap_nwas_abap_hana_sandbox/ansible_extravars.yml        | 1 +
 .../sap_s4hana_distributed/ansible_extravars.yml            | 4 ++++
 deploy_scenarios/sap_s4hana_distributed_ha/README.md        | 2 ++
 .../sap_s4hana_distributed_ha/ansible_extravars.yml         | 6 ++++++
 .../sap_s4hana_distributed_ha_maintplan/README.md           | 2 ++
 .../ansible_extravars.yml                                   | 6 ++++++
 .../sap_s4hana_distributed_maintplan/ansible_extravars.yml  | 4 ++++
 .../sap_s4hana_foundation_sandbox/ansible_extravars.yml     | 1 +
 .../sap_s4hana_foundation_standard/ansible_extravars.yml    | 2 ++
 deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml   | 1 +
 .../sap_s4hana_sandbox_maintplan/ansible_extravars.yml      | 1 +
 deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml  | 1 +
 .../sap_s4hana_standard_maintplan/ansible_extravars.yml     | 2 ++
 .../sap_webdispatcher_standalone/ansible_extravars.yml      | 1 +
 25 files changed, 59 insertions(+)

diff --git a/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml
index c076056..459880e 100755
--- a/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml
@@ -628,6 +628,7 @@ 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" # 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 }}"
diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
index b3ff09f..f61c62d 100755
--- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
+++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
@@ -715,6 +715,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hdb-node: # 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" # 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_hana_db_sid }}"
@@ -762,6 +763,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas01: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml
index b7d7bba..0f7e6db 100755
--- a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml
@@ -661,6 +661,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     ecc01: # 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" # 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 }}"
diff --git a/deploy_scenarios/sap_hana/ansible_extravars.yml b/deploy_scenarios/sap_hana/ansible_extravars.yml
index 55ec28c..53e7102 100755
--- a/deploy_scenarios/sap_hana/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana/ansible_extravars.yml
@@ -427,6 +427,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana01: # 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" # 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_hana_db_sid }}"
diff --git a/deploy_scenarios/sap_hana_ha/ansible_extravars.yml b/deploy_scenarios/sap_hana_ha/ansible_extravars.yml
index a03e014..50e6db2 100755
--- a/deploy_scenarios/sap_hana_ha/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana_ha/ansible_extravars.yml
@@ -643,6 +643,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana-p: # 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" # 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_hana_db_sid }}"
@@ -701,6 +702,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana-s: # Hostname, must be 13 characters or less
       sap_host_type: hana_secondary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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_hana_db_sid }}"
diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
index c23fcb4..0bd76fc 100755
--- a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
@@ -421,6 +421,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hdb-scaleout: # 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" # 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_hana_db_sid }}"
diff --git a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml
index e1ecd06..9cafd67 100755
--- a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml
@@ -542,6 +542,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     ecc01: # 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" # 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 }}"
diff --git a/deploy_scenarios/sap_landscape_s4hana_standard/README.md b/deploy_scenarios/sap_landscape_s4hana_standard/README.md
index c5a1680..cdbe43a 100644
--- a/deploy_scenarios/sap_landscape_s4hana_standard/README.md
+++ b/deploy_scenarios/sap_landscape_s4hana_standard/README.md
@@ -24,6 +24,8 @@ SAP S/4HANA software versions:
 
 Prior to execution, please read the [full documentation of the Ansible Playbooks for SAP](../docs/README.md) for the capabilities and different execution methods.
 
+NOTE: As this provisions and targets more than 5 hosts, it is recommended to execute the Ansible Playbook with `--forks=6` to increase execution speed, as the default forks is `5`.
+
 ## Execution outcome
 
 When executing this Ansible Playbook for SAP, the following hosts are provisioned (unless an Ansible Inventory is provided for existing hosts):
diff --git a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml
index ffc579b..3bb2c40 100755
--- a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml
+++ b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml
@@ -2027,6 +2027,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "H51"
@@ -2095,6 +2096,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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: "D01"
@@ -2143,6 +2145,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "H61"
@@ -2199,6 +2202,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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: "T01"
@@ -2247,6 +2251,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "H90"
@@ -2303,6 +2308,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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: "P01"
diff --git a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/README.md b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/README.md
index dbe6840..da70b96 100644
--- a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/README.md
+++ b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/README.md
@@ -24,6 +24,8 @@ SAP S/4HANA software versions:
 
 Prior to execution, please read the [full documentation of the Ansible Playbooks for SAP](../docs/README.md) for the capabilities and different execution methods.
 
+NOTE: As this provisions and targets more than 5 hosts, it is recommended to execute the Ansible Playbook with `--forks=6` to increase execution speed, as the default forks is `5`.
+
 ## Execution outcome
 
 When executing this Ansible Playbook for SAP, the following hosts are provisioned (unless an Ansible Inventory is provided for existing hosts):
diff --git a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml
index 4669d56..473303c 100755
--- a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml
@@ -1525,6 +1525,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "H51"
@@ -1593,6 +1594,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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: "D01"
@@ -1641,6 +1643,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "H61"
@@ -1697,6 +1700,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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: "T01"
@@ -1745,6 +1749,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: hana_primary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "H90"
@@ -1801,6 +1806,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
 
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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: "P01"
diff --git a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml
index 09e702c..76fb9c5 100755
--- a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml
@@ -623,6 +623,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas01: # 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" # 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml
index 03868cc..a6d90c7 100755
--- a/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml
@@ -2300,6 +2300,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana01: # 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" # 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_hana_db_sid }}"
@@ -2359,6 +2360,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-ascs: # Hostname, must be 13 characters or less
       sap_host_type: nwas_ascs # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -2406,6 +2408,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-pas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -2453,6 +2456,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-aas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_aas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/README.md b/deploy_scenarios/sap_s4hana_distributed_ha/README.md
index d1acc3e..3702858 100644
--- a/deploy_scenarios/sap_s4hana_distributed_ha/README.md
+++ b/deploy_scenarios/sap_s4hana_distributed_ha/README.md
@@ -23,6 +23,8 @@ SAP S/4HANA software versions:
 
 Prior to execution, please read the [full documentation of the Ansible Playbooks for SAP](../docs/README.md) for the capabilities and different execution methods.
 
+NOTE: As this provisions and targets more than 5 hosts, it is recommended to execute the Ansible Playbook with `--forks=6` to increase execution speed, as the default forks is `5`.
+
 ### Execution outcome
 
 When executing this Ansible Playbook for SAP, the following hosts are provisioned (unless an Ansible Inventory is provided for existing hosts):
diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml
index 57fe76b..715b1cf 100755
--- a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml
@@ -2850,6 +2850,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana-p: # 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" # 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_hana_db_sid }}"
@@ -2909,6 +2910,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana-s: # Hostname, must be 13 characters or less
       sap_host_type: hana_secondary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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_hana_db_sid }}"
@@ -2955,6 +2957,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-ascs: # Hostname, must be 13 characters or less
       sap_host_type: nwas_ascs # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -3002,6 +3005,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-ers: # Hostname, must be 13 characters or less
       sap_host_type: nwas_ers # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -3049,6 +3053,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-pas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -3096,6 +3101,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-aas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_aas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/README.md b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/README.md
index a5109d4..7ad0df6 100644
--- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/README.md
+++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/README.md
@@ -23,6 +23,8 @@ SAP S/4HANA software versions:
 
 Prior to execution, please read the [full documentation of the Ansible Playbooks for SAP](../docs/README.md) for the capabilities and different execution methods.
 
+NOTE: As this provisions and targets more than 5 hosts, it is recommended to execute the Ansible Playbook with `--forks=6` to increase execution speed, as the default forks is `5`.
+
 ## Execution outcome
 
 When executing this Ansible Playbook for SAP, the following hosts are provisioned (unless an Ansible Inventory is provided for existing hosts):
diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml
index fa17359..edb6f3e 100755
--- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml
@@ -1999,6 +1999,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana-p: # 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" # 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_hana_db_sid }}"
@@ -2058,6 +2059,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana-s: # Hostname, must be 13 characters or less
       sap_host_type: hana_secondary # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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_hana_db_sid }}"
@@ -2104,6 +2106,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-ascs: # Hostname, must be 13 characters or less
       sap_host_type: nwas_ascs # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -2151,6 +2154,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nw-ers: # Hostname, must be 13 characters or less
       sap_host_type: nwas_ers # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -2198,6 +2202,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-pas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -2245,6 +2250,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-aas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_aas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml
index ba21b6b..861ca72 100755
--- a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml
@@ -1649,6 +1649,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana01: # 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" # 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_hana_db_sid }}"
@@ -1708,6 +1709,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-ascs: # Hostname, must be 13 characters or less
       sap_host_type: nwas_ascs # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -1755,6 +1757,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-pas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
@@ -1802,6 +1805,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas-aas: # Hostname, must be 13 characters or less
       sap_host_type: nwas_aas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml
index 997eb99..471fc55 100755
--- a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml
@@ -717,6 +717,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     s4h01: # 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" # 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml
index b761cc0..37cfb89 100755
--- a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml
@@ -834,6 +834,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana01: # 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" # 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_hana_db_sid }}"
@@ -893,6 +894,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas01: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml
index 3ab3a87..10e1844 100755
--- a/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml
@@ -1072,6 +1072,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     s4h01: # 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" # 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml
index 9203adc..3f40d8d 100755
--- a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml
@@ -641,6 +641,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     s4h01: # 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" # 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 }}"
diff --git a/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml
index 5e2f911..42079e7 100755
--- a/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml
@@ -1208,6 +1208,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana01: # 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" # 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_hana_db_sid }}"
diff --git a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml
index 5f1b7eb..68aee91 100755
--- a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml
@@ -717,6 +717,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     hana01: # 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" # 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_hana_db_sid }}"
@@ -776,6 +777,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     nwas01: # Hostname, must be 13 characters or less
       sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB 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 }}"
diff --git a/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml b/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml
index 39487ae..2cc3e72 100755
--- a/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml
+++ b/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml
@@ -454,6 +454,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary:
     webdisp01: # Hostname, must be 13 characters or less
       sap_host_type: nwas_aas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
       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: "W{{ sap_system_wd_instance_nr }}" # SID created automatically as W<NN>

From 55dbb4c96a5a4331bed75b30f7ad0922cee35913 Mon Sep 17 00:00:00 2001
From: sean-freeman <1815807+sean-freeman@users.noreply.github.com>
Date: Sun, 28 Apr 2024 13:39:20 +0100
Subject: [PATCH 2/2] all: amend var names for sap_hana_scaleout

---
 .../ansible_extravars.yml                      |  6 +++---
 .../ansible_playbook.yml                       | 18 +++++++++---------
 .../sap_hana_scaleout/ansible_extravars.yml    |  6 +++---
 .../sap_hana_scaleout/ansible_playbook.yml     | 18 +++++++++---------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
index f61c62d..817ae7e 100755
--- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
+++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
@@ -102,9 +102,9 @@ sap_hana_install_update_etchosts: 'false'
 # Mandatory parameters : Infrastructure provisioning definitions - SAP HANA scale-out
 ####
 
-sap_hana_scaleout_active_coordinator: 1
-sap_hana_scaleout_active_worker: 2
-sap_hana_scaleout_standby: 1 # Only 0 or 1
+sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator: 1
+sap_vm_provision_calculate_sap_hana_scaleout_active_worker: 2
+sap_vm_provision_calculate_sap_hana_scaleout_standby: 1 # Only 0 or 1
 
 
 
diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml
index da46230..8340848 100644
--- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml
+++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml
@@ -56,38 +56,38 @@
       ansible.builtin.set_fact:
         "{{ sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout' }}": "{{ {} | combine({sap_vm_provision_host_specification_plan: {}}) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - dynamically build new Ansible Dictionary
       ansible.builtin.set_fact:
         "scaleout_build": "{{ scaleout_build | default({}) | combine({(lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() | first + host_scaleout_node | string): lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan][lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() | first]}) }}"
-      loop: "{{ range(0, (sap_hana_scaleout_active_coordinator | int + sap_hana_scaleout_active_worker | int + sap_hana_scaleout_standby | int), 1) | list }}"
+      loop: "{{ range(0, (sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator | int + sap_vm_provision_calculate_sap_hana_scaleout_active_worker | int + sap_vm_provision_calculate_sap_hana_scaleout_standby | int), 1) | list }}"
       loop_control:
         loop_var: host_scaleout_node
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - SAP NetWeaver hosts dynamically build new Ansible Dictionary
       ansible.builtin.set_fact:
         "other_host_spec_hosts": "{{ lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan] | combine({lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() | first: omit}) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - Merge dynamically built new Ansible Dictionary keys
       ansible.builtin.set_fact:
         all_host_specs: "{{ {} | combine(scaleout_build, other_host_spec_hosts) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - populate new Ansible Dictionary
       ansible.builtin.set_fact:
         "{{ sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout' }}": "{{ lookup('ansible.builtin.vars', sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout') | combine({sap_vm_provision_host_specification_plan: all_host_specs}) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
 
@@ -104,7 +104,7 @@
         group: sap_vm_provision_target_inventory_group
       loop: "{{ lookup('ansible.builtin.vars', sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout')[sap_vm_provision_host_specification_plan].keys() | default(lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys()) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         - sap_vm_provision_iac_type == "ansible" or sap_vm_provision_iac_type == "ansible_to_terraform"
 
 - name: Ansible Play to provision hosts for SAP
@@ -430,12 +430,12 @@
     - name: Ansible Vars extravars file check if non-interactive (no var prompts) requested by end user
       ansible.builtin.set_fact:
         sap_hana_install_addhosts: |
-          {%- if sap_hana_scaleout_standby > 0 -%}
+          {%- if sap_vm_provision_calculate_sap_hana_scaleout_standby > 0 -%}
             {%- for host in (groups['hana_primary'] | reject('search', '0') | list)[:-1] -%}
               {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }},
             {%- endfor -%}
             {{ hostvars[(groups['hana_primary'][-1])]['inventory_hostname_short'] }}:role=standby:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }}
-          {%- elif sap_hana_scaleout_standby == 0 -%}
+          {%- elif sap_vm_provision_calculate_sap_hana_scaleout_standby == 0 -%}
             {%- for host in (groups['hana_primary'] | reject('search', '0') | list) -%}
               {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }}
             {%- endfor -%}
diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
index 0bd76fc..02735b6 100755
--- a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
@@ -132,9 +132,9 @@ sap_hana_install_update_etchosts: 'false'
 # Mandatory parameters : Infrastructure provisioning definitions - SAP HANA scale-out
 ####
 
-sap_hana_scaleout_active_coordinator: 1
-sap_hana_scaleout_active_worker: 2
-sap_hana_scaleout_standby: 1 # Only 0 or 1
+sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator: 1
+sap_vm_provision_calculate_sap_hana_scaleout_active_worker: 2
+sap_vm_provision_calculate_sap_hana_scaleout_standby: 1 # Only 0 or 1
 
 
 ####
diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml b/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml
index 17b1951..411062b 100644
--- a/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml
+++ b/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml
@@ -56,38 +56,38 @@
       ansible.builtin.set_fact:
         "{{ sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout' }}": "{{ {} | combine({sap_vm_provision_host_specification_plan: {}}) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - dynamically build new Ansible Dictionary
       ansible.builtin.set_fact:
         "scaleout_build": "{{ scaleout_build | default({}) | combine({(lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() | first + host_scaleout_node | string): lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan][lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() | first]}) }}"
-      loop: "{{ range(0, (sap_hana_scaleout_active_coordinator | int + sap_hana_scaleout_active_worker | int + sap_hana_scaleout_standby | int), 1) | list }}"
+      loop: "{{ range(0, (sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator | int + sap_vm_provision_calculate_sap_hana_scaleout_active_worker | int + sap_vm_provision_calculate_sap_hana_scaleout_standby | int), 1) | list }}"
       loop_control:
         loop_var: host_scaleout_node
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - SAP NetWeaver hosts dynamically build new Ansible Dictionary
       ansible.builtin.set_fact:
         "other_host_spec_hosts": "{{ lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan] | combine({lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys() | first: omit}) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - Merge dynamically built new Ansible Dictionary keys
       ansible.builtin.set_fact:
         all_host_specs: "{{ {} | combine(scaleout_build, other_host_spec_hosts) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
     - name: Input construct - VM provisioning via Ansible - SAP HANA Scale-Out - populate new Ansible Dictionary
       ansible.builtin.set_fact:
         "{{ sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout' }}": "{{ lookup('ansible.builtin.vars', sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout') | combine({sap_vm_provision_host_specification_plan: all_host_specs}) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         # - sap_vm_provision_iac_type == "ansible"
 
 
@@ -104,7 +104,7 @@
         group: sap_vm_provision_target_inventory_group
       loop: "{{ lookup('ansible.builtin.vars', sap_vm_provision_iac_platform + '_host_specifications_dictionary_scaleout')[sap_vm_provision_host_specification_plan].keys() | default(lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary')[sap_vm_provision_host_specification_plan].keys()) }}"
       when:
-        - sap_hana_scaleout_active_coordinator is defined
+        - sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator is defined
         - sap_vm_provision_iac_type == "ansible" or sap_vm_provision_iac_type == "ansible_to_terraform"
 
 - name: Ansible Play to provision hosts for SAP
@@ -339,12 +339,12 @@
     - name: Ansible Vars extravars file check if non-interactive (no var prompts) requested by end user
       ansible.builtin.set_fact:
         sap_hana_install_addhosts: |
-          {%- if sap_hana_scaleout_standby > 0 -%}
+          {%- if sap_vm_provision_calculate_sap_hana_scaleout_standby > 0 -%}
             {%- for host in (groups['hana_primary'] | reject('search', '0') | list)[:-1] -%}
               {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }},
             {%- endfor -%}
             {{ hostvars[(groups['hana_primary'][-1])]['inventory_hostname_short'] }}:role=standby:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }}
-          {%- elif sap_hana_scaleout_standby == 0 -%}
+          {%- elif sap_vm_provision_calculate_sap_hana_scaleout_standby == 0 -%}
             {%- for host in (groups['hana_primary'] | reject('search', '0') | list) -%}
               {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }}
             {%- endfor -%}