additional PR comments

Author: bertiethorpe

.github/workflows/fatimage.yml

@@ -88,16 +88,15 @@ jobs:
           cd packer/
           packer init .
 
-          SOURCE_IMAGE=${{ fromJSON(env.SOURCE_IMAGES_MAP)[matrix.os_version][matrix.build] }}
-
           PACKER_LOG=1 packer build \
           -on-error=${{ vars.PACKER_ON_ERROR }} \
           -only=${{ matrix.build }} \
           -var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl \
-          -var "source_image_name=${SOURCE_IMAGE}" \
+          -var "source_image_name=${{ env.SOURCE_IMAGE }}" \
           openstack.pkr.hcl
         env:
           PKR_VAR_os_version: ${{ matrix.os_version }}
+          SOURCE_IMAGE: ${{ fromJSON(env.SOURCE_IMAGES_MAP)[matrix.os_version][matrix.build] }}
 
       - name: Get created image names from manifest
         id: manifest

.github/workflows/nightlybuild.yml

@@ -85,17 +85,16 @@ jobs:
           cd packer/
           packer init .
 
-          SOURCE_IMAGE=${{ fromJSON(env.SOURCE_IMAGES_MAP)[matrix.os_version] }}
-
           PACKER_LOG=1 packer build \
           -on-error=${{ vars.PACKER_ON_ERROR }} \
           -only=${{ matrix.build }} \
           -var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl \
-          -var "source_image_name=${SOURCE_IMAGE}"
+          -var "source_image_name=${{ env.SOURCE_IMAGE }}"
           openstack.pkr.hcl
 
         env:
           PKR_VAR_os_version: ${{ matrix.os_version }}
+          SOURCE_IMAGE: ${{ fromJSON(env.SOURCE_IMAGES_MAP)[matrix.os_version] }}
 
       - name: Get created image names from manifest
         id: manifest

packer/openstack.pkr.hcl

@@ -52,12 +52,9 @@ variable "source_image_name" {
 }
 
 variable "source_image" {
-  type = map(string)
-  default = {
-    RL8: null
-    RL9: null
-  }
-  description = "UUID of source image, keyed from var.os_version"
+  type = string
+  default = null
+  description = "UUID of source image"
 }
 
 variable "flavor" {
@@ -169,7 +166,7 @@ source "openstack" "openhpc" {
   security_groups = var.security_groups
 
   # Input image:
-  source_image = "${var.source_image[var.os_version]}"
+  source_image = "${var.source_image}"
   source_image_name = "${var.source_image_name}" # NB: must already exist in OpenStack
 
   # SSH: