Merge branch 'main' into rl9_v2

Author: sjpb

environments/.stackhpc/LEAFCLOUD.pkrvars.hcl

@@ -1,11 +1,12 @@
 flavor = "en1.xsmall"
 use_blockstorage_volume = true
-volume_size = 12 # GB. Compatible with SMS-lab's general.v1.tiny 
+volume_size = 12 # GB. Compatible with SMS-lab's general.v1.tiny
+volume_type = "unencrypted"
 image_disk_format = "qcow2"
 networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci
 source_image_name = "openhpc-230804-1754-80b8d714" # https://github.com/stackhpc/ansible-slurm-appliance/pull/298
 fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
-ssh_private_key_file = "~/.ssh/id_ed25519"
+ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]
 floating_ip_network = "external"

environments/.stackhpc/terraform/main.tf

@@ -22,7 +22,7 @@ variable "cluster_name" {
 variable "cluster_image" {
     description = "single image for all cluster nodes - a convenience for CI"
     type = string
-    # default = "openhpc-240116-1604-b3563a08" # https://github.com/stackhpc/ansible-slurm-appliance/pull/344
+    # default = "openhpc-240307-1635-ff0f9833" # https://github.com/stackhpc/ansible-slurm-appliance/pull/376
     default = "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2" # TODO: create packer build
 }
 

packer/openstack.pkr.hcl

@@ -120,6 +120,11 @@ variable "use_blockstorage_volume" {
   default = false
 }
 
+variable "volume_type" {
+  type = string
+  default = null
+}
+
 variable "volume_size" {
   type = number
   default = null # When not specified use the size of the builder instance root disk
@@ -139,6 +144,7 @@ source "openstack" "openhpc" {
   flavor = "${var.flavor}"
   volume_size = "${var.volume_size}"
   use_blockstorage_volume = "${var.use_blockstorage_volume}"
+  volume_type = var.volume_type
   image_disk_format = "${var.image_disk_format}"
   metadata = "${var.metadata}"
   networks = "${var.networks}"