rename images built

bertiethorpe · bertiethorpe · commit cf37a32cfd94 · 2024-09-19T10:32:33.000Z
diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
@@ -25,7 +25,7 @@ jobs:
           - RL8
           - RL9
         build:
-          - openstack.openhpc-latest
+          - openstack.rocky-latest
 
     env:
       ANSIBLE_FORCE_COLOR: True
diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl
@@ -132,8 +132,8 @@ variable "volume_size" {
   type = map(number)
   default = {
     # fat image builds, GB:
-    openhpc-latest = 15
-    openhpc-ofed = 15
+    rocky-latest = 15
+    openhpc = 15
     openhpc-cuda = 30
   }
 }
@@ -153,8 +153,8 @@ variable "groups" {
   description = "Additional inventory groups (other than 'builder') to add build VM to, keyed by source name"
   default = {
     # fat image builds:
-    openhpc-latest = ["ofed"]
-    openhpc-ofed = ["control", "compute", "login"]
+    rocky-latest = ["ofed"]
+    openhpc = ["control", "compute", "login"]
     openhpc-cuda = ["control", "compute", "login", "cuda"]
   }
 }
@@ -194,12 +194,12 @@ build {
 
   # latest fat image:
   source "source.openstack.openhpc" {
-    name = "openhpc-latest"
+    name = "rocky-latest"
   }
 
   # OFED fat image:
   source "source.openstack.openhpc" {
-    name = "openhpc-ofed"
+    name = "openhpc"
   }
 
   # CUDA fat image:

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,8 @@ variable "volume_size" {`
`132`	`132`	`type = map(number)`
`133`	`133`	`default = {`
`134`	`134`	`# fat image builds, GB:`
`135`		`- openhpc-latest = 15`
`136`		`- openhpc-ofed = 15`
	`135`	`+ rocky-latest = 15`
	`136`	`+ openhpc = 15`
`137`	`137`	`openhpc-cuda = 30`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -153,8 +153,8 @@ variable "groups" {`
`153`	`153`	`description = "Additional inventory groups (other than 'builder') to add build VM to, keyed by source name"`
`154`	`154`	`default = {`
`155`	`155`	`# fat image builds:`
`156`		`- openhpc-latest = ["ofed"]`
`157`		`- openhpc-ofed = ["control", "compute", "login"]`
	`156`	`+ rocky-latest = ["ofed"]`
	`157`	`+ openhpc = ["control", "compute", "login"]`
`158`	`158`	`openhpc-cuda = ["control", "compute", "login", "cuda"]`
`159`	`159`	`}`
`160`	`160`	`}`
`@@ -194,12 +194,12 @@ build {`
`194`	`194`
`195`	`195`	`# latest fat image:`
`196`	`196`	`source "source.openstack.openhpc" {`
`197`		`- name = "openhpc-latest"`
	`197`	`+ name = "rocky-latest"`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`# OFED fat image:`
`201`	`201`	`source "source.openstack.openhpc" {`
`202`		`- name = "openhpc-ofed"`
	`202`	`+ name = "openhpc"`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`# CUDA fat image:`