allow for extra build configuration

Author: bertiethorpe

.github/workflows/extra.yml

@@ -101,6 +101,7 @@ jobs:
           -var "source_image_name=${{ fromJSON(env.FAT_IMAGES)['cluster_image'][matrix.build.source_image_name_key] }}" \
           -var "image_name=${{ matrix.build.image_name }}" \
           -var "inventory_groups=${{ matrix.build.inventory_groups }}" \
+          -var "use_blockstorage_volume=true" \
           -var "volume_size=${{ matrix.build.volume_size }}" \
           openstack.pkr.hcl
         

environments/.stackhpc/LEAFCLOUD.pkrvars.hcl

@@ -1,7 +1,5 @@
 flavor = "ec1.large"
-use_blockstorage_volume = false
 volume_type = "unencrypted"
-volume_size = null
 networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"

packer/openstack.pkr.hcl

@@ -109,7 +109,7 @@ variable "manifest_output_path" {
 
 variable "use_blockstorage_volume" {
   type = bool
-  default = true
+  default = false
 }
 
 variable "volume_type" {
@@ -119,7 +119,7 @@ variable "volume_type" {
 
 variable "volume_size" {
   type = number
-  default = 15
+  default = null
 }
 
 variable "image_disk_format" {
@@ -178,7 +178,7 @@ source "openstack" "openhpc" {
   ssh_bastion_private_key_file = var.ssh_bastion_private_key_file
 
   # Output image:
-  # image_disk_format = "qcow2"
+  image_disk_format = var.use_blockstorage_volume ? "qcow2" : null
   image_visibility = var.image_visibility
 
 }