Merge pull request #51 from sap-linuxlab/dev

release 1.1.0

Author: sean-freeman

README.md

@@ -1,6 +1,5 @@
 # Terraform Modules for SAP
 [![Terraform Validate Tests](https://github.com/sap-linuxlab/terraform.modules_for_sap/actions/workflows/terraform_validate.yml/badge.svg?branch=main)](https://github.com/sap-linuxlab/terraform.modules_for_sap/actions/workflows/terraform_validate.yml)
-[![SAP Software Availability Tests](https://github.com/sap-linuxlab/terraform.modules_for_sap/actions/workflows/terraform_ansible_software_availability.yml/badge.svg?branch=main)](https://github.com/sap-linuxlab/terraform.modules_for_sap/actions/workflows/terraform_ansible_software_availability.yml)
 
 Terraform Modules for SAP are a subcomponent designed to be used from the [Terraform Templates for SAP](https://github.com/sap-linuxlab/terraform.templates_for_sap), but can be executed individually.
 
@@ -117,7 +116,7 @@ The below table lists the Terraform Modules for SAP, and any detailed documentat
 | <br/>***Host Network Access for SAP*** |   |   |   |   |   |   |   |
 | Append Network Security rules for SAP (e.g. Security Group Rules)<sub><br>     - SAP NetWeaver AS (ABAP)<br>     - SAP NetWeaver AS (JAVA)<br>     - SAP HANA<br>     - SAP HANA XSA<br>     - SAP Web Dispatcher</sub> | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
 | <br/>***Host NFS*** |   |   |   |   |   |   |   |
-| Provision | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning: | N/A | N/A |
+| Provision | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
 | <br/>***Proxy interconnect provision for increased security hosts*** |   |   |   |   |   |   |   |
 | Find OS Image | N/A | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
 | Create Proxy host | N/A | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |

all/ansible_playbooks_for_sap/create_ansible_extravars.tf

@@ -38,5 +38,8 @@ sap_vm_provision_ssh_host_private_key_file_path: "${abspath(path.root)}/tmp/host
 ${ strcontains(var.module_var_ansible_sap_scenario_selection, "hana") ? "# Ansible Playbooks for SAP - SAP HANA variables when multiple hosts (HA or Scale-Out)" : "" }
 ${ strcontains(var.module_var_ansible_sap_scenario_selection, "hana") ? "sap_hana_install_update_firewall: true" : "" }
 
+${ var.module_var_ibmpower_flag ? "# Ansible Playbooks for SAP - IBM Power" : "" }
+${ var.module_var_ibmpower_flag ? "sap_storage_setup_multipath_enable_and_detect: true" : "" }
+
 EOF
 }

all/ansible_playbooks_for_sap/module_variables.tf

@@ -46,3 +46,7 @@ variable "module_var_ansible_sap_system_nwas_java_scs_instance_nr" {}
 variable "module_var_ansible_sap_system_nwas_java_ci_instance_nr" {}
 variable "module_var_ansible_sap_maintenance_planner_transaction_name" {}
 variable "module_var_ansible_sap_software_download_directory" {}
+
+variable "module_var_ibmpower_flag" {
+  default = false
+}

all/ansible_playbooks_for_sap/note_dev.md

@@ -0,0 +1,43 @@
+# CPU Architecture detection
+
+Added flag for IBM Power. With the homogenised approach leveraging 'existing hosts' created by Terraform and execution of the Ansible Playbooks for SAP, there is no Terraform Variable that indicates the hosts are IBM Power.
+
+
+# Alternative data conversion
+
+Data conversion from Terraform Map of host specifications, to a Python (Ansible) Dictionary can be achieved instead using Jinja:
+
+```yaml
+    # For end user ease of use, the host specifications dictionary uses disk_count to indicate how many disks will be provisioned
+    # However the sap_storage_setup Ansible Role can not detect disk_count, and requires the key to be renamed lvm_lv_stripes
+    - name: Convert sap_vm_provision_*_host_specifications_dictionary.storage_definition to sap_storage_setup.sap_storage_setup_definition
+      ansible.builtin.set_fact:
+        sap_storage_setup_definition: "{{ sap_storage_setup_definition | default([]) + [converted_element] }}"
+      vars:
+        converted_element: |
+          {% set current_element = (convert_item | dict2items) %}
+          {% set new_element = [] %}
+          {% for entry in current_element %}
+            {%- if "disk_count" in entry.key %}
+              {%- set conv = new_element.extend([
+                {
+                  'key': 'lvm_lv_stripes',
+                  'value': entry.value,
+                }
+              ]) %}
+            {%- elif not "disk_type" in entry.key %}
+              {%- set add_entry = new_element.extend([
+                {
+                  'key': entry.key,
+                  'value': entry.value,
+                }
+              ]) %}
+            {%- endif -%}
+          {% endfor %}
+          {{ new_element | items2dict }}
+      loop: "{{ terraform_host_specification_storage_definition | list }}"
+      # loop: "{{ terraform_host_specification[inventory_hostname]['storage_definition'] | list }}"
+      loop_control:
+        loop_var: convert_item
+        label: "{{ convert_item.name }}"
+```