renable support for volume-backed compute instances, inc. for stackhpc env

Author: sjpb

environments/.stackhpc/terraform/main.tf

@@ -54,6 +54,10 @@ variable "volume_backed_instances" {
     default = false
 }
 
+variable "root_volume_size" {
+    default = 15
+}
+
 variable "k3s_token" {
     type = string
 }
@@ -94,6 +98,7 @@ module "cluster" {
     }
 
     volume_backed_instances = var.volume_backed_instances
+    root_volume_size = var.root_volume_size
 
     environment_root = var.environment_root
     # Can reduce volume size a lot for short-lived CI clusters:

environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf

@@ -19,4 +19,6 @@ module "compute" {
   k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
   security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
   baremetal_nodes = data.external.baremetal_nodes.result
+  volume_backed_instances = var.volume_backed_instances
+  root_volume_size =  var.root_volume_size
 }

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf

@@ -53,15 +53,11 @@ variable "vnic_profile" {
 }
 
 variable "volume_backed_instances" {
-    description = "Whether to use volumes for root disks"
     type = bool
-    default = false
 }
 
 variable "root_volume_size" {
-    description = "Size of volume for root volumes if using volume backed instances, in Gb"
     type = number
-    default = 40
 }
 
 variable "security_group_ids" {