Support rke2 volume device and lb type configuration (#12)

* added config option for lb provider and rke2 volume device

* unified naming of vars, prevent lb_provider and rke2_volume_device from being null to ensure default value to be used

Author: srieger1

loadbalancer.tf

@@ -10,7 +10,7 @@ resource "openstack_lb_loadbalancer_v2" "lb" {
   vip_network_id        = openstack_networking_network_v2.net.id
   vip_address           = local.internal_ip
   admin_state_up        = "true"
-  loadbalancer_provider = "octavia"
+  loadbalancer_provider = "${var.lb_provider}"
 
   depends_on = [
     openstack_networking_subnet_v2.lb

main.tf

@@ -35,11 +35,12 @@ module "servers" {
   availability_zones = coalesce(each.value.availability_zones, [])
   affinity           = coalesce(each.value.affinity, "soft-anti-affinity")
 
-  rke2_version     = each.value.rke2_version
-  rke2_config      = each.value.rke2_config
-  rke2_token       = random_string.rke2_token.result
-  rke2_volume_size = each.value.rke2_volume_size
-  rke2_volume_type = each.value.rke2_volume_type
+  rke2_version        = each.value.rke2_version
+  rke2_config         = each.value.rke2_config
+  rke2_token          = random_string.rke2_token.result
+  rke2_volume_size    = each.value.rke2_volume_size
+  rke2_volume_type    = each.value.rke2_volume_type
+  rke2_volume_device  = each.value.rke2_volume_device
 
   s3 = local.s3
 
@@ -85,6 +86,7 @@ module "servers" {
         network_id          = openstack_networking_network_v2.net.id
         subnet_id           = openstack_networking_subnet_v2.lb.id
         floating_network_id = data.openstack_networking_network_v2.floating_net.id
+        lb_provider         = var.lb_provider
         cluster_name        = var.name
       }),
       "cilium.yml" : templatefile("${path.module}/manifests/cilium.yml.tpl", {
@@ -135,11 +137,12 @@ module "agents" {
   availability_zones = coalesce(each.value.availability_zones, [])
   affinity           = coalesce(each.value.affinity, "soft-anti-affinity")
 
-  rke2_version     = each.value.rke2_version
-  rke2_config      = each.value.rke2_config
-  rke2_token       = random_string.rke2_token.result
-  rke2_volume_size = each.value.rke2_volume_size
-  rke2_volume_type = each.value.rke2_volume_type
+  rke2_version       = each.value.rke2_version
+  rke2_config        = each.value.rke2_config
+  rke2_token         = random_string.rke2_token.result
+  rke2_volume_size   = each.value.rke2_volume_size
+  rke2_volume_type   = each.value.rke2_volume_type
+  rke2_volume_device = each.value.rke2_volume_device
 
   system_user         = each.value.system_user
   keypair_name        = openstack_compute_keypair_v2.key.name

manifests/cloud-controller-openstack.yml.tpl

@@ -37,7 +37,7 @@ spec:
         %{~ endif ~}
         subnet-id: ${subnet_id}
         network-id: ${network_id}
-        lb-provider: octavia
+        lb-provider: ${lb_provider}
         manage-security-groups: true
         max-shared-lb: 10
     controllerExtraArgs: |-

node/cloud-init.yml.tpl

@@ -9,9 +9,9 @@ growpart:
 fs_setup:
   - label: None
     filesystem: ext4
-    device: /dev/sdb
+    device: ${rke2_device}
 mounts:
-  - ["/dev/sdb", "/var/lib/rancher/rke2", "ext4", "defaults,nofail", "0", "2"]
+  - [${rke2_device}, "/var/lib/rancher/rke2", "ext4", "defaults,nofail", "0", "2"]
 
 package_update: true
 package_upgrade: true

node/main.tf

@@ -79,6 +79,7 @@ resource "openstack_compute_instance_v2" "instance" {
     rke2_token   = var.rke2_token
     rke2_version = var.rke2_version
     rke2_conf    = var.rke2_config != null ? var.rke2_config : ""
+    rke2_device  = var.rke2_volume_device
     is_server    = var.is_server
     is_first     = var.is_first && count.index == 0
     bootstrap    = var.bootstrap && var.is_first && count.index == 0

node/variables.tf

@@ -105,6 +105,12 @@ variable "rke2_volume_type" {
   type = string
 }
 
+variable "rke2_volume_device" {
+  type     = string
+  default  = "/dev/sda"
+  nullable = false
+}
+
 variable "s3" {
   type = object({
     endpoint      = string

variables.tf

@@ -85,6 +85,12 @@ variable "dns_nameservers4" {
   default = ["1.1.1.1", "1.0.0.1"]
 }
 
+variable "lb_provider" {
+  type     = string
+  default  = "octavia"
+  nullable = false
+}
+
 variable "bootstrap" {
   type    = bool
   default = false
@@ -105,6 +111,7 @@ variable "servers" {
     rke2_config        = optional(string)
     rke2_volume_size   = number
     rke2_volume_type   = optional(string)
+    rke2_volume_device = optional(string)
   }))
   validation {
     condition = (
@@ -136,6 +143,7 @@ variable "agents" {
     rke2_config        = optional(string)
     rke2_volume_size   = number
     rke2_volume_type   = optional(string)
+    rke2_volume_device = optional(string)
   }))
   validation {
     condition = (