diff --git a/sap_bw4hana_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_bw4hana_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_bw4hana_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_bw4hana_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index a04b64b..49651c3 100644 --- a/sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_bw4hana_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_bw4hana_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_bw4hana_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_bw4hana_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_bw4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index b4ff4e2..356bc7a 100644 --- a/sap_bw4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_bw4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf index f92ea07..1fa6bdf 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf +++ b/sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf @@ -145,7 +145,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -164,13 +168,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -186,10 +195,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -251,14 +260,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -275,7 +288,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -290,6 +304,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf index 4251078..9bfbd7e 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { bwh01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf +++ b/sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index 225ddf1..b5653a8 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/versions.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_powervs/versions.tf +++ b/sap_bw4hana_single_node_install/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_bw4hana_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_bw4hana_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_bw4hana_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index ff19e73..1a72ac1 100644 --- a/sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_bw4hana_single_node_install/msazure_vm/variable_map_os.tf b/sap_bw4hana_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_bw4hana_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_bw4hana_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 0d9c6c8..2a8a7ee 100644 --- a/sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_ecc_hana_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_ecc_hana_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_ecc_hana_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_ecc_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 227cd86..18e657b 100644 --- a/sap_ecc_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_ecc_hana_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_ecc_hana_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_ecc_hana_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_ecc_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 5c8bebe..990bd96 100644 --- a/sap_ecc_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/main.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/main.tf index 3642b0d..9c0d92a 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_powervs/main.tf +++ b/sap_ecc_hana_single_node_install/ibmcloud_powervs/main.tf @@ -145,7 +145,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -164,13 +168,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -186,10 +195,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -249,14 +258,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -273,7 +286,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -288,6 +302,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf index 1decd50..1bd28d1 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { ecc01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf +++ b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index 177c640..2c62de5 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/versions.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_powervs/versions.tf +++ b/sap_ecc_hana_single_node_install/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_ecc_hana_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_ecc_hana_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_ecc_hana_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_ecc_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index b378bce..b3f8acf 100644 --- a/sap_ecc_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_install/msazure_vm/variable_map_os.tf b/sap_ecc_hana_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_ecc_hana_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_ecc_hana_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_ecc_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 5e4c812..5f8ad02 100644 --- a/sap_ecc_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf index ec398d1..aa153e4 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf @@ -148,7 +148,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -167,13 +171,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -189,10 +198,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -254,14 +263,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -278,7 +291,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -293,6 +307,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf index bd74add..72608e3 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { ecc01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars index df07ddc..9cdab19 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars index c023914..9cdab19 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 24f5fa3..caf4b37 100644 --- a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 1651d7d..928fff5 100644 --- a/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index cf2bc61..e3a3cb9 100644 --- a/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_ecc_ibmdb2_single_node_install/msazure_vm/variable_map_os.tf b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_ecc_ibmdb2_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 17f7420..b89b8ce 100644 --- a/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index adb3f26..07404c6 100644 --- a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 7e419f2..ce24ea3 100644 --- a/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_oracledb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 81bb8dc..c939d9a 100644 --- a/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_ecc_oracledb_single_node_install/msazure_vm/variable_map_os.tf b/sap_ecc_oracledb_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_ecc_oracledb_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_ecc_oracledb_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 547c3fc..93d5597 100644 --- a/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_ecc_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_ecc_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_ecc_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_ecc_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 1362651..c5a7380 100644 --- a/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_ecc_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_ecc_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_ecc_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_ecc_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_ecc_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index c0ababf..a403d92 100644 --- a/sap_ecc_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_ecc_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_ecc_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_ecc_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_ecc_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index b601476..19db23a 100644 --- a/sap_ecc_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapase_single_node_install/msazure_vm/variable_map_os.tf b/sap_ecc_sapase_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_ecc_sapase_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_ecc_sapase_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index be623a2..d12bf26 100644 --- a/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 1362651..c5a7380 100644 --- a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index c0ababf..a403d92 100644 --- a/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 768a757..7a0050c 100644 --- a/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variable_map_os.tf b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 358ca0c..77af67c 100644 --- a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_hana_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_hana_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_hana_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_hana_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 1f885c4..497c0c0 100644 --- a/sap_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_hana_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_hana_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_hana_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_hana_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 786f842..60d3d9a 100644 --- a/sap_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_hana_single_node_install/ibmcloud_powervs/main.tf b/sap_hana_single_node_install/ibmcloud_powervs/main.tf index bc507ce..80f09c8 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/main.tf +++ b/sap_hana_single_node_install/ibmcloud_powervs/main.tf @@ -141,7 +141,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -160,13 +164,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -182,10 +191,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -247,14 +256,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -271,7 +284,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -286,6 +300,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf b/sap_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf index 9657990..011dcdd 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { hana01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf b/sap_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf b/sap_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf +++ b/sap_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index 6f7da32..a3bc4f4 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_hana_single_node_install/ibmcloud_powervs/versions.tf b/sap_hana_single_node_install/ibmcloud_powervs/versions.tf index 31fdc0d..d194bb9 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/versions.tf +++ b/sap_hana_single_node_install/ibmcloud_powervs/versions.tf @@ -35,15 +35,10 @@ provider "ibm" { } - +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud provider "ibm" { - - alias = "powervs_secure" - + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_hana_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_hana_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_hana_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_hana_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index d0d2ac9..a3bc4f4 100644 --- a/sap_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_hana_single_node_install/msazure_vm/variable_map_os.tf b/sap_hana_single_node_install/msazure_vm/variable_map_os.tf index 3440fed..f09c2fd 100644 --- a/sap_hana_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_hana_single_node_install/msazure_vm/variable_map_os.tf @@ -7,71 +7,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - }, - - sles-12-sp5-sap = { - publisher = "SUSE" - offer = "sles-sap-12-sp5" - sku = "gen2" - }, - - sles-15-sp1-sap = { - publisher = "SUSE" - offer = "sles-sap-15-sp1" - sku = "gen2" - }, - - sles-15-sp2-sap = { - publisher = "SUSE" - offer = "sles-sap-15-sp2" - sku = "gen2" - }, - - sles-15-sp3-sap = { - publisher = "SUSE" - offer = "sles-sap-15-sp3" - sku = "gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 44c246d..f7d73bf 100644 --- a/sap_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_nwas_abap_hana_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_abap_hana_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_abap_hana_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_abap_hana_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 7f1725a..01790d9 100644 --- a/sap_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_nwas_abap_hana_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_abap_hana_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_abap_hana_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_abap_hana_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_abap_hana_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 4962bd3..5b94c54 100644 --- a/sap_nwas_abap_hana_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_nwas_abap_hana_install/ibmcloud_powervs/main.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/main.tf index 91e82d8..3fb5434 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/main.tf +++ b/sap_nwas_abap_hana_install/ibmcloud_powervs/main.tf @@ -145,7 +145,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -164,13 +168,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -186,10 +195,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -251,14 +260,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -275,7 +288,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -290,6 +304,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_hosts.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_hosts.tf index 12d564b..758248c 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { nw01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_locations.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_os.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_os.tf +++ b/sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index fe0bd64..d501d1e 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_nwas_abap_hana_install/ibmcloud_powervs/versions.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/versions.tf +++ b/sap_nwas_abap_hana_install/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_nwas_abap_hana_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_abap_hana_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_abap_hana_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_abap_hana_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 6c13a0b..12ff904 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_nwas_abap_hana_install/msazure_vm/variable_map_os.tf b/sap_nwas_abap_hana_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_abap_hana_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_abap_hana_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars index d83d4c9..71046f7 100644 --- a/sap_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars index f6ffa43..5466617 100644 --- a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars index da186f5..cef16c9 100644 --- a/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars index e541e45..638d89b 100644 --- a/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_nwas_abap_ibmdb2_install/msazure_vm/variable_map_os.tf b/sap_nwas_abap_ibmdb2_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_abap_ibmdb2_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_abap_ibmdb2_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars index 384ed4f..2174034 100644 --- a/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations diff --git a/sap_nwas_abap_oracledb_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_abap_oracledb_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_abap_oracledb_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_abap_oracledb_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars index a20bd24..783e14f 100644 --- a/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_nwas_abap_oracledb_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_abap_oracledb_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_abap_oracledb_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_abap_oracledb_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_abap_oracledb_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_oracledb_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 6510e15..8491757 100644 --- a/sap_nwas_abap_oracledb_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_oracledb_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_nwas_abap_oracledb_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_abap_oracledb_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_abap_oracledb_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_abap_oracledb_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_abap_oracledb_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_abap_oracledb_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 8d1a042..08d99ab 100644 --- a/sap_nwas_abap_oracledb_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_oracledb_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_nwas_abap_oracledb_install/msazure_vm/variable_map_os.tf b/sap_nwas_abap_oracledb_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_abap_oracledb_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_abap_oracledb_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars index 33fe7a9..fdde699 100644 --- a/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass#321" diff --git a/sap_nwas_abap_sapase_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_abap_sapase_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_abap_sapase_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_abap_sapase_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 6cc7ecd..c25df42 100644 --- a/sap_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapase_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_abap_sapase_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_abap_sapase_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_abap_sapase_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_abap_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 6788728..cc1ef7a 100644 --- a/sap_nwas_abap_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapase_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_abap_sapase_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_abap_sapase_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_abap_sapase_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_abap_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 1a64ccc..81a7764 100644 --- a/sap_nwas_abap_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapase_install/msazure_vm/variable_map_os.tf b/sap_nwas_abap_sapase_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_abap_sapase_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_abap_sapase_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars index ffa5ee8..a1a52ed 100644 --- a/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 39fde33..5e0a235 100644 --- a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 7814747..eb82405 100644 --- a/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 1c0e243..351be42 100644 --- a/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_abap_sapmaxdb_install/msazure_vm/variable_map_os.tf b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_abap_sapmaxdb_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars index b050463..dfba9c2 100644 --- a/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars index c699cea..73aef23 100644 --- a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 93cbba0..0eb080c 100644 --- a/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_ibmdb2_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars index a74a84e..fe6ac27 100644 --- a/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_ibmdb2_install/msazure_vm/variable_map_os.tf b/sap_nwas_java_ibmdb2_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_java_ibmdb2_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_java_ibmdb2_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars index d5dfd8f..edd4575 100644 --- a/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_sapase_install/aws_ec2_instance/variable_map_os.tf b/sap_nwas_java_sapase_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_nwas_java_sapase_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_nwas_java_sapase_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 8f2516e..02fc48e 100644 --- a/sap_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_sapase_install/gcp_ce_vm/variable_map_os.tf b/sap_nwas_java_sapase_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_nwas_java_sapase_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_nwas_java_sapase_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_nwas_java_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_nwas_java_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 441d835..d5b9574 100644 --- a/sap_nwas_java_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_sapase_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_sapase_install/ibmcloud_vs/variable_map_os.tf b/sap_nwas_java_sapase_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_nwas_java_sapase_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_nwas_java_sapase_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_nwas_java_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_nwas_java_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 5927f68..45bc44f 100644 --- a/sap_nwas_java_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_sapase_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_nwas_java_sapase_install/msazure_vm/variable_map_os.tf b/sap_nwas_java_sapase_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_nwas_java_sapase_install/msazure_vm/variable_map_os.tf +++ b/sap_nwas_java_sapase_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars index bd6ff84..a73fc4b 100644 --- a/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_s4hana_distributed_install/aws_ec2_instance/variable_map_os.tf b/sap_s4hana_distributed_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_s4hana_distributed_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_s4hana_distributed_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_s4hana_distributed_install/gcp_ce_vm/variable_map_os.tf b/sap_s4hana_distributed_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_s4hana_distributed_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_s4hana_distributed_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_s4hana_distributed_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_s4hana_distributed_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 80544ca..bef17e9 100644 --- a/sap_s4hana_distributed_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_distributed_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_distributed_install/ibmcloud_vs/variable_map_os.tf b/sap_s4hana_distributed_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_s4hana_distributed_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_s4hana_distributed_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_s4hana_distributed_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_distributed_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 14d95cc..4f24cab 100644 --- a/sap_s4hana_distributed_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_distributed_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_distributed_install/msazure_vm/variable_map_os.tf b/sap_s4hana_distributed_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_s4hana_distributed_install/msazure_vm/variable_map_os.tf +++ b/sap_s4hana_distributed_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_s4hana_distributed_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_s4hana_distributed_install/msazure_vm/variables_generic_for_cli.tfvars index d83d4c9..71046f7 100644 --- a/sap_s4hana_distributed_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_distributed_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_s4hana_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_s4hana_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_s4hana_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 734cc8b..d18b204 100644 --- a/sap_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_s4hana_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_s4hana_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_s4hana_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_s4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 80544ca..bef17e9 100644 --- a/sap_s4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install/ibmcloud_powervs/main.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/main.tf index 6593336..0fd5f71 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/main.tf +++ b/sap_s4hana_single_node_install/ibmcloud_powervs/main.tf @@ -145,7 +145,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -164,13 +168,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -186,10 +195,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -251,14 +260,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -275,7 +288,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -290,6 +304,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf index d6cf399..2c3c580 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { s4h01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf +++ b/sap_s4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index b3ec91a..1e7ac94 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install/ibmcloud_powervs/versions.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/versions.tf +++ b/sap_s4hana_single_node_install/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_s4hana_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_s4hana_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_s4hana_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_s4hana_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 14d95cc..4f24cab 100644 --- a/sap_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install/msazure_vm/variable_map_os.tf b/sap_s4hana_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_s4hana_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_s4hana_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index d83d4c9..71046f7 100644 --- a/sap_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variable_map_os.tf b/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variable_map_os.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars index 734cc8b..d18b204 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variable_map_os.tf b/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variable_map_os.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variables_generic_for_cli.tfvars index 80544ca..bef17e9 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/main.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/main.tf index 7daf5ad..de93538 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/main.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/main.tf @@ -146,7 +146,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -165,13 +169,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -187,10 +196,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -252,14 +261,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -276,7 +289,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -291,6 +305,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_hosts.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_hosts.tf index d6cf399..2c3c580 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { s4h01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_locations.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_os.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_os.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars index b3ec91a..1e7ac94 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/versions.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/versions.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variable_map_os.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variable_map_os.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars index f17cfc5..e742d80 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "sap.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variable_map_os.tf b/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variable_map_os.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars index d83d4c9..71046f7 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf index 1abc462..d08097a 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/main.tf @@ -148,7 +148,11 @@ module "run_account_bootstrap_powervs_workspace_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main" - providers = { ibm = ibm.standard } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix @@ -167,13 +171,18 @@ module "run_account_bootstrap_powervs_networks_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } - module_var_resource_group_id = module.run_account_init_module.output_resource_group_id - module_var_resource_prefix = var.resource_prefix - module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) - module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_resource_group_id = module.run_account_init_module.output_resource_group_id + module_var_resource_prefix = var.resource_prefix + module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location) + module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn + module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name } @@ -189,10 +198,10 @@ module "run_powervs_interconnect_sg_update_module" { providers = { ibm = ibm.standard } - module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id - module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id + module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id + module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id - module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet + module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet } @@ -254,14 +263,18 @@ module "run_host_provision_module" { source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main" - providers = { ibm = ibm.powervs_secure } + # Define TF Module child provider name = TF Template parent provider name + providers = { + ibm.main = ibm.standard , + ibm.powervs_secure_enclave = ibm.powervs_secure_enclave + } module_var_resource_group_id = module.run_account_init_module.output_resource_group_id module_var_resource_prefix = var.resource_prefix module_var_resource_tags = var.resource_tags - module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid - module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks + module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid + module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks 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 @@ -278,7 +291,8 @@ module "run_host_provision_module" { module_var_dns_root_domain_name = var.dns_root_domain module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance - module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip + module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip + module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) @@ -293,6 +307,7 @@ module "run_host_provision_module" { module_var_virtual_server_hostname = each.key + module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ] diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf index 9b1a8f8..7e1d2c2 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_hosts.tf @@ -10,6 +10,7 @@ variable "map_host_specifications" { small_256gb = { s4h01 = { // Hostname + hardware_machine_type = "e1080" virtual_server_profile = "ush1-4x256" // An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types // Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned) diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf index 88036b1..bd8f4b5 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_locations.tf @@ -1,5 +1,4 @@ - variable "map_ibm_powervs_to_vpc_az" { description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone" @@ -7,22 +6,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" // no Cloud Connection available at this location + wdc07 = "us-east" // no Cloud Connection available at this location sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } } diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf index 7f78511..6c5387e 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf @@ -7,11 +7,30 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1" - - sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4" + # OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy) + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # OS Image keys for IBM Power Virtual Server + rhel-8-4-sap-ha = "RHEL8-SP4-SAP" + rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL" + rhel-8-6-sap-ha = "RHEL8-SP6-SAP" + rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL" + rhel-8-8-sap-ha = "RHEL8-SP8-SAP" + rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL" + rhel-9-2-sap-ha = "RHEL9-SP2-SAP" + rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL" + + sles-15-2-sap-ha = "SLES15-SP2-SAP" + sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL" + sles-15-3-sap-ha = "SLES15-SP3-SAP" + sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL" + sles-15-4-sap-ha = "SLES15-SP4-SAP" + sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL" + sles-15-5-sap-ha = "SLES15-SP5-SAP" + sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL" } diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars index 469ef8a..4f24cab 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-1-sap-ha-byol" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf index 31fdc0d..de39fa8 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/versions.tf @@ -36,14 +36,11 @@ provider "ibm" { } -provider "ibm" { - - alias = "powervs_secure" +# Terraform Provider (with Alias) declaration - for IBM Power Infrastructure environment via IBM Cloud +provider "ibm" { + alias = "powervs_secure_enclave" ibmcloud_api_key = var.ibmcloud_api_key - - region = local.ibmcloud_powervs_region - - zone = lower(var.ibmcloud_powervs_location) // Required for IBM Power VS only - + region = local.ibmcloud_powervs_region // IBM Power VS Region + zone = lower(var.ibmcloud_powervs_location) // IBM Power VS Location } diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars index 14d95cc..4f24cab 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_solman_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_solman_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_solman_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_solman_sapase_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index bcd5078..d6bbdd8 100644 --- a/sap_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_solman_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_solman_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_solman_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_solman_sapase_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_solman_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_solman_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 2f75b86..cae28a3 100644 --- a/sap_solman_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_solman_sapase_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_solman_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_solman_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_solman_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_solman_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_solman_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_solman_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 4aa1ffe..2b27dfe 100644 --- a/sap_solman_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_solman_sapase_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_solman_sapase_single_node_install/msazure_vm/variable_map_os.tf b/sap_solman_sapase_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_solman_sapase_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_solman_sapase_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 1afd3c6..1065fe0 100644 --- a/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_32vcpu" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_anydb_install_master_password = "NewPass@321" diff --git a/sap_solman_saphana_single_node_install/aws_ec2_instance/variable_map_os.tf b/sap_solman_saphana_single_node_install/aws_ec2_instance/variable_map_os.tf index 6e9483c..ca3e33a 100644 --- a/sap_solman_saphana_single_node_install/aws_ec2_instance/variable_map_os.tf +++ b/sap_solman_saphana_single_node_install/aws_ec2_instance/variable_map_os.tf @@ -8,40 +8,40 @@ variable "map_os_image_regex" { default = { rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*" - - rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" - + # rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed 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-10 = "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*" + + # rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed + # rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed 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-8-10-sap-ha = "*RHEL-SAP-8.10.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-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed + # sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed + # sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed + sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6 = "*suse-sles-15-sp6-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*" + sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" } diff --git a/sap_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 7f1725a..01790d9 100644 --- a/sap_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_solman_saphana_single_node_install/gcp_ce_vm/variable_map_os.tf b/sap_solman_saphana_single_node_install/gcp_ce_vm/variable_map_os.tf index 954ecd3..a21b7e8 100644 --- a/sap_solman_saphana_single_node_install/gcp_ce_vm/variable_map_os.tf +++ b/sap_solman_saphana_single_node_install/gcp_ce_vm/variable_map_os.tf @@ -9,70 +9,25 @@ variable "map_os_image_regex" { default = { - rhel-8-latest = { - 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" - }, - - rhel-8-2-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-2-sap-ha" - }, - - rhel-8-4-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-4-sap-ha" - }, - - rhel-8-6-sap-ha = { - project = "rhel-sap-cloud" - family = "rhel-8-6-sap-ha" - }, - - sles-15-latest = { - project = "suse-cloud" - family = "sles-15" - }, - - sles-12-sp5-sap = { - project = "suse-sap-cloud" - family = "sles-12-sp5-sap" - }, - - sles-15-sp1-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp1-sap" - }, - - sles-15-sp2-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp2-sap" - }, - - sles-15-sp3-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp3-sap" - }, - - sles-15-sp4-sap = { - project = "suse-sap-cloud" - family = "sles-15-sp4-sap" - }, + rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" }, + rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" }, + + sles-12-latest = { project = "suse-cloud" , family = "sles-12" }, + sles-15-latest = { project = "suse-cloud" , family = "sles-15" }, + + # rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed + 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" }, // removed + rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" }, + rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" }, + rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" }, + + sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" }, + # sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed + sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" }, + sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" }, + sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" }, + sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" } } diff --git a/sap_solman_saphana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars index 4962bd3..5b94c54 100644 --- a/sap_solman_saphana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars @@ -3,7 +3,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-latest" +bastion_os_image = "rhel-9-latest" bastion_user = "bastionuser" @@ -11,7 +11,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-8-6-sap-ha" sap_hana_install_master_password = "NewPass$321" diff --git a/sap_solman_saphana_single_node_install/ibmcloud_vs/variable_map_os.tf b/sap_solman_saphana_single_node_install/ibmcloud_vs/variable_map_os.tf index 16cfc85..be22ad8 100644 --- a/sap_solman_saphana_single_node_install/ibmcloud_vs/variable_map_os.tf +++ b/sap_solman_saphana_single_node_install/ibmcloud_vs/variable_map_os.tf @@ -7,35 +7,34 @@ variable "map_os_image_regex" { default = { - rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" - - rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" - - rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" - + rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*" + rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*" + + # rhel-7-6-sap-ha = ".*redhat.*7-6.*amd64.*hana.*" // retrievable from deprecated list + # rhel-7-9-sap-ha = ".*redhat.*7-9.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-1-sap-ha = ".*redhat.*8-1.*amd64.*hana.*" // retrievable from deprecated list + # rhel-8-2-sap-ha = ".*redhat.*8-2.*amd64.*hana.*" // retrievable from deprecated list rhel-8-4-sap-ha = ".*redhat.*8-4.*amd64.*hana.*" - - rhel-7-6-sap-applications = ".*redhat.*7-6.*amd64.*applications.*" - - rhel-8-1-sap-applications = ".*redhat.*8-1.*amd64.*applications.*" - - rhel-8-2-sap-applications = ".*redhat.*8-2.*amd64.*applications.*" - - rhel-8-4-sap-applications = ".*redhat.*8-4.*amd64.*applications.*" - - rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*" - - sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" - - sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" - + rhel-8-6-sap-ha = ".*redhat.*8-6.*amd64.*hana.*" + rhel-8-8-sap-ha = ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha = ".*redhat.*8-10.*amd64.*hana.*" + rhel-9-0-sap-ha = ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha = ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha = ".*redhat.*9-4.*amd64.*hana.*" + + sles-15-2 = ".*sles.*15-5.*amd64-[0-9]" + sles-15-2 = ".*sles.*15-6.*amd64-[0-9]" + + # sles-12-4-sap-ha = ".*sles.*12-4.*amd64.*hana.*" // retrievable from deprecated list + # sles-12-5-sap-ha = ".*sles.*12-5.*amd64.*hana.*" // retrievable from deprecated list + # sles-15-1-sap-ha = ".*sles.*15-1.*amd64.*hana.*" // retrievable from deprecated list sles-15-2-sap-ha = ".*sles.*15-2.*amd64.*hana.*" - - sles-12-4-sap-applications = ".*sles.*12-4.*amd64.*applications.*" - - sles-15-1-sap-applications = ".*sles.*15-1.*amd64.*applications.*" - - sles-15-2-sap-applications = ".*sles.*15-2.*amd64.*applications.*" + 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.*" + sles-15-6-sap-ha = ".*sles.*15-6.*amd64.*hana.*" } diff --git a/sap_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 8a7f133..ac8f63c 100644 --- a/sap_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars @@ -4,7 +4,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -12,7 +12,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_nwas_abap_ascs_instance_no = "01" diff --git a/sap_solman_saphana_single_node_install/msazure_vm/variable_map_os.tf b/sap_solman_saphana_single_node_install/msazure_vm/variable_map_os.tf index 010c0a6..c919301 100644 --- a/sap_solman_saphana_single_node_install/msazure_vm/variable_map_os.tf +++ b/sap_solman_saphana_single_node_install/msazure_vm/variable_map_os.tf @@ -12,47 +12,48 @@ variable "map_os_image_regex" { default = { - rhel-8-4 = { - publisher = "RedHat" - offer = "RHEL" - sku = "84-gen2" - }, - - rhel-8-1-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "81sapha-gen2" - }, - - rhel-8-2-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "82sapha-gen2" - }, - - rhel-8-4-sap-ha = { - publisher = "RedHat" - offer = "RHEL-SAP-HA" - sku = "84sapha-gen2" - }, - - rhel-8-1-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "81sapapps-gen2" - }, - - rhel-8-2-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "82sapapps-gen2" - }, - - rhel-8-4-sap-applications = { - publisher = "RedHat" - offer = "RHEL-SAP-APPS" - sku = "84sapapps-gen2" - } + rhel-8-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "8-gen2" }, + rhel-8-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "81gen2" }, + rhel-8-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "82gen2" }, + rhel-8-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "83-gen2" }, + rhel-8-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "84-gen2" }, + rhel-8-5 = { publisher = "RedHat" , offer = "RHEL" , sku = "85-gen2" }, + rhel-8-6 = { publisher = "RedHat" , offer = "RHEL" , sku = "86-gen2" }, + rhel-8-7 = { publisher = "RedHat" , offer = "RHEL" , sku = "87-gen2" }, + rhel-8-8 = { publisher = "RedHat" , offer = "RHEL" , sku = "88-gen2" }, + rhel-8-9 = { publisher = "RedHat" , offer = "RHEL" , sku = "89-gen2" }, + rhel-8-10 = { publisher = "RedHat" , offer = "RHEL" , sku = "810-gen2" }, + rhel-9-0 = { publisher = "RedHat" , offer = "RHEL" , sku = "90-gen2" }, + rhel-9-1 = { publisher = "RedHat" , offer = "RHEL" , sku = "91-gen2" }, + rhel-9-2 = { publisher = "RedHat" , offer = "RHEL" , sku = "92-gen2" }, + rhel-9-3 = { publisher = "RedHat" , offer = "RHEL" , sku = "93-gen2" }, + rhel-9-4 = { publisher = "RedHat" , offer = "RHEL" , sku = "94-gen2" }, + + rhel-8-1-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "81sapha-gen2" }, + rhel-8-2-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "82sapha-gen2" }, + rhel-8-4-sap-ha = { publisher = "RedHat" , 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-8-10-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "810sapha-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-9-4-sap-ha = { publisher = "RedHat" , offer = "RHEL-SAP-HA" , sku = "94sapha-gen2" }, + + sles-12-5 = { publisher = "SUSE" , offer = "sles-12-sp5" , sku = "gen2" }, + sles-15-1 = { publisher = "SUSE" , offer = "sles-15-sp1" , sku = "gen2" }, + sles-15-2 = { publisher = "SUSE" , offer = "sles-15-sp2" , sku = "gen2" }, + sles-15-3 = { publisher = "SUSE" , offer = "sles-15-sp3" , sku = "gen2" }, + sles-15-4 = { publisher = "SUSE" , offer = "sles-15-sp4" , sku = "gen2" }, + sles-15-5 = { publisher = "SUSE" , offer = "sles-15-sp5" , sku = "gen2" }, + sles-15-6 = { publisher = "SUSE" , offer = "sles-15-sp6" , sku = "gen2" }, + + sles-12-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-12-sp5" , sku = "gen2" }, + sles-15-1-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp1" , sku = "gen2" }, + sles-15-2-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp2" , sku = "gen2" }, + sles-15-3-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp3" , sku = "gen2" }, + sles-15-4-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp4" , sku = "gen2" }, + sles-15-5-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp5" , sku = "gen2" }, + sles-15-6-sap-ha = { publisher = "SUSE" , offer = "sles-sap-15-sp6" , sku = "gen2" } } diff --git a/sap_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index d83d4c9..71046f7 100644 --- a/sap_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -2,7 +2,7 @@ resource_prefix = "sap" dns_root_domain = "poc.cloud" -bastion_os_image = "rhel-8-4" +bastion_os_image = "rhel-9-2" bastion_user = "bastionuser" @@ -10,7 +10,7 @@ bastion_ssh_port = 50222 host_specification_plan = "small_256gb" -host_os_image = "rhel-8-4-sap-ha" +host_os_image = "rhel-9-2-sap-ha" sap_hana_install_master_password = "NewPass$321"