Merge pull request #18 from nimbolus/fix-data-volume-mount

fix mount data volume by label
nimbolus · May 4, 2022 · f30007c · f30007c
2 parents f4fd590 + 1fe7718
commit f30007c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/k3s-openstack/main.tf b/k3s-openstack/main.tf
@@ -1,6 +1,6 @@
 locals {
   create_data_volume = var.data_volume_size > 0
-  data_volume_name   = var.image_scsi_bus ? "/dev/sdb" : "/dev/vdb"
+  data_volume_name   = var.ephemeral_data_volume ? "ephemeral0" : (var.image_scsi_bus ? "/dev/sdb" : "/dev/vdb")
 }
 
 data "openstack_compute_flavor_v2" "k3s" {
@@ -43,6 +43,7 @@ module "k3s" {
   bootstrap_token_id              = var.bootstrap_token_id
   bootstrap_token_secret          = var.bootstrap_token_secret
   persistent_volume_dev           = local.create_data_volume ? local.data_volume_name : ""
+  persistent_volume_label         = var.ephemeral_data_volume ? "ephemeral0" : "k3s-data"
 }
 
 resource "openstack_compute_instance_v2" "node" {

diff --git a/k3s/cloud-init/k3s.yml b/k3s/cloud-init/k3s.yml
@@ -2,12 +2,16 @@
 
 %{if persistent_volume_dev != ""~}
 fs_setup:
-  - label: k3s-data
+  - label: ${persistent_volume_label}
     filesystem: ext4
     device: ${persistent_volume_dev}
 
 mounts:
-  - [${persistent_volume_dev}, /mnt/persistent]
+%{if persistent_volume_dev == persistent_volume_label~}
+  # clear default mount for ephemeral disk
+  - [${persistent_volume_dev}, null]
+%{endif~}
+  - [LABEL=${persistent_volume_label}, /mnt/persistent]
 %{endif~}
 
 write_files:

diff --git a/k3s/outputs.tf b/k3s/outputs.tf
@@ -13,6 +13,7 @@ output "user_data" {
     ip                              = var.k3s_ip
     external_ip                     = var.k3s_external_ip
     persistent_volume_dev           = var.persistent_volume_dev
+    persistent_volume_label         = var.persistent_volume_label
     is_server                       = contains(var.k3s_args, "server")
     k3s_config = base64encode(<<-EOT
       K3S_TOKEN=${var.cluster_token}

diff --git a/k3s/variables.tf b/k3s/variables.tf
@@ -72,6 +72,11 @@ variable "persistent_volume_dev" {
   description = "optional device for persistent data (e.g. /dev/vdb)"
 }
 
+variable "persistent_volume_label" {
+  default     = "k3s-data"
+  description = "filesystem label for persistent data"
+}
+
 variable "cni_plugins_version" {
   default = "v0.9.0"
 }