Add OL8 HPC image Support

arnaudfroidmont · arnaudfroidmont · commit 8da020782a98 · 2022-12-08T22:15:17.000-07:00
diff --git a/autoscaling/tf_init/marketplace.tf b/autoscaling/tf_init/marketplace.tf
@@ -1,5 +1,5 @@
 locals {
-    mp_listing_id = var.use_marketplace_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id : var.marketplace_listing == "HPC" ? var.marketplace_listing_id_HPC : var.marketplace_listing_id_GPU : ""
+    mp_listing_id = var.use_marketplace_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id : substr(var.marketplace_listing,0,3) == "HPC" ? var.marketplace_listing_id_HPC : var.marketplace_listing_id_GPU : ""
     mp_version_id = var.use_old_marketplace_image ? var.marketplace_version_id[split(".", var.marketplace_listing)[0]] : var.marketplace_version_id[var.marketplace_listing]
 }
 
diff --git a/conf/variables.tpl b/conf/variables.tpl
@@ -46,7 +46,8 @@ variable "marketplace_version_id" {
        "2" = "OL7.8-OFED5.0-1.0.0.0-UEK-20200826"
        "3" = "OL7.7-OFED-4.4-2.0.7.0-UEK-20200229"
        "4" = "OL7.9-OFED5.0-2.1.8.0-RHCK-20210709"
-       "HPC" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"
+       "HPC_OL7" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"
+       "HPC_OL8" = "OracleLinux-8-RHCK-OFED-5.4-3.5.8.0-2022.11.15-0"
        "GPU" = "OracleLinux-7-RHCK-3.10.0-OFED-5.4-3.4.0.0-GPU-510-2022.09.23-1"
   }
 }
diff --git a/marketplace.tf b/marketplace.tf
@@ -1,9 +1,9 @@
 locals {
 //  listing_number = split(".", var.marketplace_listing)[0]
-    mp_listing_id = var.use_marketplace_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id : var.marketplace_listing == "HPC" ? var.marketplace_listing_id_HPC : var.marketplace_listing_id_GPU : ""
+    mp_listing_id = var.use_marketplace_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id : substr(var.marketplace_listing,0,3) == "HPC" ? var.marketplace_listing_id_HPC : var.marketplace_listing_id_GPU : ""
     mp_bastion_listing_id = var.use_standard_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id :var.marketplace_listing_id_HPC : ""
     mp_version_id = var.use_old_marketplace_image ? var.marketplace_version_id[split(".", var.old_marketplace_listing)[0]] : var.marketplace_version_id[var.marketplace_listing]
-    mp_bastion_version_id = var.use_old_marketplace_image ? var.marketplace_version_id[split(".", var.old_marketplace_listing)[0]] : var.marketplace_version_id["HPC"]
+    mp_bastion_version_id = var.use_old_marketplace_image ? var.marketplace_version_id[split(".", var.old_marketplace_listing)[0]] : var.marketplace_version_id["HPC_OL7"]
 }
 
 /* 
diff --git a/schema.yaml b/schema.yaml
@@ -604,9 +604,10 @@ variables:
     description: "Marketplace listing to use"
     required: true
     enum:
-      - "HPC"
+      - "HPC_OL7"
+      - "HPC_OL8"
       - "GPU"
-    default: "HPC"
+    default: "HPC_OL7"
     visible:
       and:
         - ${use_marketplace_image}
diff --git a/variables.tf b/variables.tf
@@ -58,7 +58,7 @@ variable "privilege_group_name" { default = "privilege" }
 
 
 variable "marketplace_listing" { 
-  default = "HPC"
+  default = "HPC_OL7"
 } 
 variable "old_marketplace_listing" { 
   default = "4. Oracle Linux 7.9 OFED 5.0-2.1.8.0 RHCK 20210709"
@@ -70,7 +70,8 @@ variable "marketplace_version_id" {
        "2" = "OL7.8-OFED5.0-1.0.0.0-UEK-20200826"
        "3" = "OL7.7-OFED-4.4-2.0.7.0-UEK-20200229"
        "4" = "OL7.9-OFED5.0-2.1.8.0-RHCK-20210709"
-       "HPC" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"
+       "HPC_OL7" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"
+       "HPC_OL8" = "OracleLinux-8-RHCK-OFED-5.4-3.5.8.0-2022.11.15-0"
        "GPU" = "OracleLinux-7-RHCK-3.10.0-OFED-5.4-3.4.0.0-GPU-510-2022.09.23-1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`locals {`
`2`		`- mp_listing_id = var.use_marketplace_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id : var.marketplace_listing == "HPC" ? var.marketplace_listing_id_HPC : var.marketplace_listing_id_GPU : ""`
	`2`	`+ mp_listing_id = var.use_marketplace_image ? var.use_old_marketplace_image ? var.old_marketplace_listing_id : substr(var.marketplace_listing,0,3) == "HPC" ? var.marketplace_listing_id_HPC : var.marketplace_listing_id_GPU : ""`
`3`	`3`	`mp_version_id = var.use_old_marketplace_image ? var.marketplace_version_id[split(".", var.marketplace_listing)[0]] : var.marketplace_version_id[var.marketplace_listing]`
`4`	`4`	`}`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ variable "marketplace_version_id" {`
`46`	`46`	`"2" = "OL7.8-OFED5.0-1.0.0.0-UEK-20200826"`
`47`	`47`	`"3" = "OL7.7-OFED-4.4-2.0.7.0-UEK-20200229"`
`48`	`48`	`"4" = "OL7.9-OFED5.0-2.1.8.0-RHCK-20210709"`
`49`		`- "HPC" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"`
	`49`	`+ "HPC_OL7" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"`
	`50`	`+ "HPC_OL8" = "OracleLinux-8-RHCK-OFED-5.4-3.5.8.0-2022.11.15-0"`
`50`	`51`	`"GPU" = "OracleLinux-7-RHCK-3.10.0-OFED-5.4-3.4.0.0-GPU-510-2022.09.23-1"`
`51`	`52`	`}`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ variable "privilege_group_name" { default = "privilege" }`
`58`	`58`
`59`	`59`
`60`	`60`	`variable "marketplace_listing" {`
`61`		`- default = "HPC"`
	`61`	`+ default = "HPC_OL7"`
`62`	`62`	`}`
`63`	`63`	`variable "old_marketplace_listing" {`
`64`	`64`	`default = "4. Oracle Linux 7.9 OFED 5.0-2.1.8.0 RHCK 20210709"`
`@@ -70,7 +70,8 @@ variable "marketplace_version_id" {`
`70`	`70`	`"2" = "OL7.8-OFED5.0-1.0.0.0-UEK-20200826"`
`71`	`71`	`"3" = "OL7.7-OFED-4.4-2.0.7.0-UEK-20200229"`
`72`	`72`	`"4" = "OL7.9-OFED5.0-2.1.8.0-RHCK-20210709"`
`73`		`- "HPC" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"`
	`73`	`+ "HPC_OL7" = "OL7.9-RHCK-3.10.0-OFED-5.4-3.4.0-1"`
	`74`	`+ "HPC_OL8" = "OracleLinux-8-RHCK-OFED-5.4-3.5.8.0-2022.11.15-0"`
`74`	`75`	`"GPU" = "OracleLinux-7-RHCK-3.10.0-OFED-5.4-3.4.0.0-GPU-510-2022.09.23-1"`
`75`	`76`	`}`
`76`	`77`	`}`