In the CI use flavors with non-local storage (#1668)

This also adds the feature to define the volume type for base volumes.

Signed-off-by: Christian Berendt <[email protected]>

terraform/environments/ci.tfvars

@@ -1,16 +1,16 @@
 # customisation:access_floatingip
 # customisation:default
 # customisation:neutron_floatingip
-# override:manager_boot_from_image
+# override:manager_boot_from_volume
 # override:neutron_availability_zone_hints_network
 # override:neutron_availability_zone_hints_router
-# override:nodes_boot_from_image
-flavor_manager            = "SCS-4V-8-50s"
-flavor_node               = "SCS-8V-32-100s"
+# override:nodes_boot_from_volume
+flavor_manager            = "SCS-4V-8"
+flavor_node               = "SCS-8V-32"
 volume_type               = "ssd"
 image                     = "Ubuntu 22.04"
 image_node                = "Ubuntu 22.04"
-public                    = "public"
 availability_zone         = "nova"
-volume_availability_zone  = "nova"
 network_availability_zone = "nova"
+volume_availability_zone  = "nova"
+public                    = "public"

terraform/manager.tf

@@ -20,6 +20,7 @@ resource "openstack_blockstorage_volume_v3" "manager_base_volume" {
   name              = "${var.prefix}-volume-manager-base"
   size              = var.volume_size_base
   availability_zone = var.volume_availability_zone
+  volume_type       = var.volume_type
 }
 
 resource "openstack_compute_instance_v2" "manager_server" {

terraform/nodes.tf

@@ -27,4 +27,5 @@ resource "openstack_blockstorage_volume_v3" "node_base_volume" {
   name              = "${var.prefix}-volume-${count.index}-node-base"
   size              = var.volume_size_base
   availability_zone = var.volume_availability_zone
+  volume_type       = var.volume_type
 }

terraform/variables.tf

@@ -27,6 +27,11 @@ variable "volume_size_storage" {
   default = 10
 }
 
+variable "volume_type" {
+  type    = string
+  default = "__DEFAULT__"
+}
+
 variable "flavor_node" {
   type    = string
   default = "SCS-8V:32:50"
@@ -37,11 +42,6 @@ variable "flavor_manager" {
   default = "SCS-4V:8:50"
 }
 
-variable "volume_type" {
-  type    = string
-  default = "__DEFAULT__"
-}
-
 variable "availability_zone" {
   type    = string
   default = "south-2"