Merge pull request #24 from sap-linuxlab/dev

0.7.2 release

.github/workflows/terraform_validate_100.yml

@@ -18,7 +18,7 @@ jobs:
       max-parallel: 10
       matrix:
         terraform_ver: [~1.0.0] # Job matrix can generate a maximum of 256 jobs per workflow run
-        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
+        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
         infrastructure_platform: [aws_ec2_instance, ibmcloud_vs, ibmcloud_powervs, ibmpowervc, msazure_vm]
     steps:
       - name: Checkout

.github/workflows/terraform_validate_110.yml

@@ -18,7 +18,7 @@ jobs:
       max-parallel: 10
       matrix:
         terraform_ver: [~1.1.0] # Job matrix can generate a maximum of 256 jobs per workflow run
-        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
+        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
         infrastructure_platform: [aws_ec2_instance, ibmcloud_vs, ibmcloud_powervs, ibmpowervc, msazure_vm]
     steps:
       - name: Checkout

.github/workflows/terraform_validate_120.yml

@@ -18,7 +18,7 @@ jobs:
       max-parallel: 10
       matrix:
         terraform_ver: [~1.2.0] # Job matrix can generate a maximum of 256 jobs per workflow run
-        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
+        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
         infrastructure_platform: [aws_ec2_instance, ibmcloud_vs, ibmcloud_powervs, ibmpowervc, msazure_vm]
     steps:
       - name: Checkout

.github/workflows/terraform_validate_130.yml

@@ -18,7 +18,7 @@ jobs:
       max-parallel: 10
       matrix:
         terraform_ver: [~1.3.0] # Job matrix can generate a maximum of 256 jobs per workflow run
-        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
+        sap_solution_scenario: [sap_bw4hana_single_node_install, sap_ecc_hana_single_node_install, sap_ecc_hana_single_node_system_copy_homogeneous_hdb, sap_ecc_ibmdb2_single_node_install, sap_ecc_oracledb_single_node_install, sap_ecc_sapase_single_node_install, sap_ecc_sapmaxdb_single_node_install, sap_hana_single_node_install, sap_nwas_abap_hana_install, sap_nwas_abap_ibmdb2_install, sap_nwas_abap_oracledb_install, sap_nwas_abap_sapase_install, sap_nwas_abap_sapmaxdb_install, sap_nwas_java_ibmdb2_install, sap_nwas_java_sapase_install, sap_s4hana_single_node_install, sap_s4hana_single_node_install_maintenance_plan, sap_s4hana_single_node_system_copy_homogeneous_hdb]
         infrastructure_platform: [aws_ec2_instance, ibmcloud_vs, ibmcloud_powervs, ibmpowervc, msazure_vm]
     steps:
       - name: Checkout

README.md

@@ -23,10 +23,11 @@ These Terraform Templates for SAP are designed to be:
 | SAP Software solution scenario | Infrastructure Platform |
 |:--- |:--- |
 | **SAP HANA 2.0 (any version)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:white_check_mark: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
-| **SAP S/4HANA (2020, 2021, 2022)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:white_check_mark: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
+| **SAP S/4HANA (2021, 2022)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:white_check_mark: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
 | **SAP S/4HANA (2020, 2021, 2022)**<br/>single-node installation,<br/>using SAP Maintenance Planner Stack XML<br/>(to run SUM and SPAM / SAINT) | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:white_check_mark: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
 | **SAP S/4HANA (1909, 2020, 2021, 2022)**<br/>single-node System Copy installation</br>(Homogeneous with SAP HANA Backup / Recovery) | <sub><ul><li>:warning: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:warning: Microsoft Azure</li><li>:warning: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
 | **SAP BW/4HANA (2021)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:white_check_mark: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
+| **SAP ECC on SAP HANA (EHP7, EHP8)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:white_check_mark: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
 | **SAP ECC on SAP HANA (EHP7, EHP8)**<br/>single-node System Copy installation</br>(Homogeneous with SAP HANA Backup / Recovery) | <sub><ul><li>:warning: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:white_check_mark: IBM Cloud, Power VS</li><li>:warning: Microsoft Azure</li><li>:warning: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
 | **SAP ECC on IBM Db2 (EHP7, EHP8)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:no_entry_sign: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:no_entry_sign: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |
 | **SAP ECC on Oracle DB (EHP7, EHP8)**<br/>single-node installation | <sub><ul><li>:white_check_mark: AWS EC2</li><li>:white_check_mark: IBM Cloud, Intel VS</li><li>:no_entry_sign: IBM Cloud, Power VS</li><li>:white_check_mark: Microsoft Azure</li><li>:no_entry_sign: IBM PowerVM LPAR</li></ul>*Coming Soon: GCP VM, OVirt VM, VMware vSphere VM*</sub> |

sap_bw4hana_single_node_install/aws_ec2_instance/main.tf

@@ -1,7 +1,7 @@
 
 module "run_ansible_dry_run" {
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
 
@@ -251,7 +251,7 @@ module "run_ansible_sap_bw4hana_install" {
 
   depends_on = [module.run_host_provision_module]
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   # Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
   module_var_bastion_boolean         = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars

@@ -20,7 +20,7 @@ sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"
 
-sap_hana_install_instance_number = "10"
+sap_hana_install_instance_number = "90"
 
 sap_nwas_abap_ascs_instance_no = "01"
 

sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf

@@ -1,7 +1,7 @@
 
 module "run_ansible_dry_run" {
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
 
@@ -58,7 +58,6 @@ module "run_account_bootstrap_module" {
   module_var_resource_prefix   = var.resource_prefix
 
   module_var_ibmcloud_vpc_subnet_name           = local.ibmcloud_vpc_subnet_create_boolean ? module.run_account_init_module.output_vpc_subnet_name : var.ibmcloud_vpc_subnet_name
-  module_var_ibmcloud_vpc_subnet_create_boolean = local.ibmcloud_vpc_subnet_create_boolean
   module_var_ibmcloud_vpc_availability_zone     = var.map_ibm_powervs_to_vpc_az[var.ibmcloud_powervs_location]
 
   module_var_dns_root_domain_name = var.dns_root_domain
@@ -329,7 +328,7 @@ module "run_ansible_sap_bw4hana_install" {
 
   depends_on = [module.run_host_provision_module]
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   # Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
   module_var_bastion_boolean         = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars

@@ -22,7 +22,7 @@ sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"
 
-sap_hana_install_instance_number = "10"
+sap_hana_install_instance_number = "90"
 
 sap_nwas_abap_ascs_instance_no = "01"
 

sap_bw4hana_single_node_install/ibmcloud_vs/main.tf

@@ -1,7 +1,7 @@
 
 module "run_ansible_dry_run" {
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
 
@@ -58,7 +58,6 @@ module "run_account_bootstrap_module" {
   module_var_resource_prefix   = var.resource_prefix
 
   module_var_ibmcloud_vpc_subnet_name           = local.ibmcloud_vpc_subnet_create_boolean ? module.run_account_init_module.output_vpc_subnet_name : var.ibmcloud_vpc_subnet_name
-  module_var_ibmcloud_vpc_subnet_create_boolean = local.ibmcloud_vpc_subnet_create_boolean
   module_var_ibmcloud_vpc_availability_zone     = var.ibmcloud_vpc_availability_zone
 
   module_var_dns_root_domain_name = var.dns_root_domain
@@ -272,7 +271,7 @@ module "run_ansible_sap_bw4hana_install" {
 
   depends_on = [module.run_host_provision_module]
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   # Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
   module_var_bastion_boolean         = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars

@@ -22,7 +22,7 @@ sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"
 
-sap_hana_install_instance_number = "10"
+sap_hana_install_instance_number = "90"
 
 sap_nwas_abap_ascs_instance_no = "01"
 

sap_bw4hana_single_node_install/ibmpowervc/main.tf

@@ -1,7 +1,7 @@
 
 module "run_ansible_dry_run" {
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
 
@@ -148,7 +148,7 @@ module "run_ansible_sap_bw4hana_install" {
 
   depends_on = [module.run_host_provision_module]
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   # Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
   module_var_bastion_boolean         = var.bastion_boolean

sap_bw4hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars

@@ -10,7 +10,7 @@ sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"
 
-sap_hana_install_instance_number = "10"
+sap_hana_install_instance_number = "90"
 
 sap_nwas_abap_ascs_instance_no = "01"
 

sap_bw4hana_single_node_install/msazure_vm/main.tf

@@ -1,7 +1,7 @@
 
 module "run_ansible_dry_run" {
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
 
@@ -285,7 +285,7 @@ module "run_ansible_sap_bw4hana_install" {
 
   depends_on = [module.run_host_provision_module]
 
-  source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
+  source = "github.com/sap-linuxlab/terraform.modules_for_sap//all/ansible_sap_bw4hana_install?ref=main"
 
   # Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
   module_var_bastion_boolean         = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/msazure_vm/variables.tf

@@ -102,7 +102,7 @@ variable "sap_hana_install_sid" {
 }
 
 variable "sap_hana_install_instance_number" {
-  description = "Ansible - SAP HANA install: Instance Number (e.g. 10)"
+  description = "Ansible - SAP HANA install: Instance Number (e.g. 90)"
 
   validation {
     error_message = "Cannot use Instance Number 43 (HA port number) or 89 (Windows Remote Desktop Services)."

sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars

@@ -18,7 +18,7 @@ sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"
 
-sap_hana_install_instance_number = "10"
+sap_hana_install_instance_number = "90"
 
 sap_nwas_abap_ascs_instance_no = "01"