Merge branch 'main' into fix/lustre-lu-18085

Author: sjpb

docs/networks.md

@@ -157,11 +157,6 @@ compute = {
 }
 ```
 
-If there is no default route at all (either from a subnet gateway or from
-`gateway_ip`) then a dummy route is created via the access network interface to
-ensure [correct](https://docs.k3s.io/installation/airgap#default-network-route)
-`k3s` operation.
-
 When using a subnet with no default gateway, OpenStack's nameserver for the
 subnet may refuse lookups. External nameservers can be defined using the
 [resolv_conf](../ansible/roles/resolv_conf/README.md) role.

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

@@ -18,6 +18,7 @@ module "compute" {
   vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
   volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
   root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
+  root_volume_type = lookup(each.value, "root_volume_type", var.root_volume_type)
   gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip)
   nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template)
 

environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf

@@ -48,6 +48,7 @@ resource "openstack_compute_instance_v2" "control" {
       source_type  = "image"
       destination_type = var.volume_backed_instances ? "volume" : "local"
       volume_size = var.volume_backed_instances ? var.root_volume_size : null
+      volume_type = var.volume_backed_instances ? var.root_volume_type : null
       boot_index = 0
       delete_on_termination = true
   }

environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf

@@ -18,6 +18,7 @@ module "login" {
   vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
   volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
   root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
+  root_volume_type = lookup(each.value, "root_volume_type", var.root_volume_type)
   gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip)
   nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template)
 

environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf

@@ -82,6 +82,7 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {
       source_type  = "image"
       destination_type = "volume"
       volume_size = var.root_volume_size
+      volume_type = var.root_volume_type
       boot_index = 0
       delete_on_termination = true
     }
@@ -136,6 +137,7 @@ resource "openstack_compute_instance_v2" "compute" {
       source_type  = "image"
       destination_type = "volume"
       volume_size = var.root_volume_size
+      volume_type = var.root_volume_type
       boot_index = 0
       delete_on_termination = true
     }

environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf

@@ -49,6 +49,11 @@ variable "root_volume_size" {
     default = 40
 }
 
+variable "root_volume_type" {
+    type = string
+    default = null
+}
+
 variable "extra_volumes" {
     description = <<-EOF
         Mapping defining additional volumes to create and attach.

environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf

@@ -228,6 +228,12 @@ variable "root_volume_size" {
     default = 40
 }
 
+variable "root_volume_type" {
+    description = "Type of root volume, if using volume backed instances. If unset, the target cloud default volume type is used."
+    type = string
+    default = null
+}
+
 variable "gateway_ip" {
     description = "Address to add default route via"
     type = string