Skip to content

Commit

Permalink
fix: os image sequence
Browse files Browse the repository at this point in the history
  • Loading branch information
@sean-freeman
sean-freeman committed Nov 24, 2024
1 parent 9e4df13 commit e10e16f
Show file tree
Hide file tree
Showing 29 changed files with 205 additions and 203 deletions.
43 changes: 23 additions & 20 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,30 +7,33 @@ variable "map_os_image_regex" {

default = {

# 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"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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-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-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-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.*"

}

Expand Down
5 changes: 2 additions & 3 deletions sap_bw4hana_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
43 changes: 23 additions & 20 deletions sap_ecc_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,33 @@ variable "map_os_image_regex" {

default = {

# 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"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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-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-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-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.*"

}

Expand Down
5 changes: 2 additions & 3 deletions sap_ecc_hana_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
43 changes: 23 additions & 20 deletions sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,33 @@ variable "map_os_image_regex" {

default = {

# 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"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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-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-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-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.*"

}

Expand Down
5 changes: 2 additions & 3 deletions sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
5 changes: 2 additions & 3 deletions sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
5 changes: 2 additions & 3 deletions sap_ecc_oracledb_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
5 changes: 2 additions & 3 deletions sap_ecc_sapase_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
5 changes: 2 additions & 3 deletions sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
2 changes: 2 additions & 0 deletions sap_hana_single_node_install/ibmcloud_powervs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# OS Image keys for IBM Power Virtual Server
rhel-8-4-sap-ha = "RHEL8-SP4-SAP"
Expand Down
5 changes: 2 additions & 3 deletions sap_hana_single_node_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
43 changes: 23 additions & 20 deletions sap_nwas_abap_hana_install/ibmcloud_powervs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,33 @@ variable "map_os_image_regex" {

default = {

# 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"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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-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-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-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.*"

}

Expand Down
5 changes: 2 additions & 3 deletions sap_nwas_abap_hana_install/ibmcloud_vs/variable_map_os.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ variable "map_os_image_regex" {
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
sles-15-5 = ".*sles.*15-5.*amd64-[0-9]"
sles-15-6 = ".*sles.*15-6.*amd64-[0-9]"

# 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
Expand All @@ -24,9 +26,6 @@ variable "map_os_image_regex" {
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
Expand Down
Loading

0 comments on commit e10e16f

Please sign in to comment.