Skip to content

Commit

Permalink
Merge pull request #33 from sap-linuxlab/dev
Browse files Browse the repository at this point in the history 
1.0.1 patch release
  • Loading branch information
@sean-freeman
sean-freeman authored Nov 15, 2024
2 parents b9beed0 + d7c7d44 commit 2ca1a61
Show file tree
Hide file tree
Showing 203 changed files with 2,855 additions and 3,442 deletions.
42 changes: 21 additions & 21 deletions sap_bw4hana_single_node_install/aws_ec2_instance/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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*"

}

Expand Down
2 changes: 1 addition & 1 deletion sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
83 changes: 19 additions & 64 deletions sap_bw4hana_single_node_install/gcp_ce_vm/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

}

Expand Down
4 changes: 2 additions & 2 deletions sap_bw4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ resource_prefix = "sap"

dns_root_domain = "poc.cloud"

bastion_os_image = "rhel-8-latest"
bastion_os_image = "rhel-9-latest"

bastion_user = "bastionuser"

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"

Expand Down
43 changes: 29 additions & 14 deletions sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

}

Expand All @@ -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

}

Expand Down Expand Up @@ -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

Expand All @@ -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)

Expand All @@ -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,"") == "" ]
Expand Down
1 change: 1 addition & 0 deletions sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
27 changes: 16 additions & 11 deletions sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@


variable "map_ibm_powervs_to_vpc_az" {

description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone"

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"

}

}
Expand All @@ -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"

}

}
29 changes: 24 additions & 5 deletions sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

}

Expand Down
Loading

0 comments on commit 2ca1a61

Please sign in to comment.