apps/storage: test with zfs volumes

2 files changed, 45 insertions, 29 deletions

diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml
index 09e69bb5..eb8b41b8 100644
--- a/chaos-at-home/ch-testvm-prometheus.yml
+++ b/chaos-at-home/ch-testvm-prometheus.yml
@@ -11,7 +11,7 @@
 - name: Basic Setup
   hosts: ch-testvm-prometheus
   roles:
-  - role: storage/lvm/base
+  - role: storage/zfs/base
   - role: nginx/base
   - role: x509/static-ca/base
   - role: apt-repo/spreadspace
diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml
index f155fa38..c88b8481 100644
--- a/inventory/host_vars/ch-testvm-prometheus.yml
+++ b/inventory/host_vars/ch-testvm-prometheus.yml
@@ -15,6 +15,12 @@ install:
         size: 10g
         properties:
           'syncoid:sync': 'false'
+      sdb:
+        type: zfs
+        name: data
+        size: 10g
+        properties:
+          'syncoid:sync': 'false'
   interfaces:
   - bridge: br-svc
     name: svc0
@@ -41,13 +47,20 @@ ntp_variant: systemd-timesyncd
 #################
 system_lvm_volume_size_root: 3G
 
+apt_repo_components:
+  - main
+  - contrib  ## for zfs
 
-lvm_volumes:
-  system/storage: &_lvm_thinpool_system_storage_
-    vg: "{{ host_name }}"
-    lv: storage
-    thinpool: true
-    size: 5G
+zfs_pools:
+  storage:
+    mountpoint: /srv/storage
+    create_vdevs: /dev/sdb
+
+zfs_volumes:
+  storage:
+    whawty:
+      children:
+        auth: {}
 
 
 spreadspace_apt_repo_components:
@@ -58,18 +71,18 @@ docker_plugins:
   - buildx
 
 docker_storage:
-  type: lvm
-  parent: *_lvm_thinpool_system_storage_
-  lv: docker
-  size: 1G
-  fs: ext4
+  type: zfs
+  pool: storage
+  name: docker
+  properties:
+    quota: 1G
 
 kubelet_storage:
-  type: lvm
-  parent: *_lvm_thinpool_system_storage_
-  lv: kubelet
-  size: 1G
-  fs: ext4
+  type: zfs
+  pool: storage
+  name: kubelet
+  properties:
+    quota: 1G
 
 kubernetes_version: 1.28.5
 kubernetes_container_runtime: docker
@@ -171,6 +184,11 @@ apps_publish_zone__ch_testvm_prometheus:
     key_content: "{{ ch_testvm_prometheus_apps_publish_ca_key }}"
 
 
+
+_whawty_auth_zfs_base_:
+  pool: storage
+  name: whawty/auth
+
 whawty_auth_instances:
   foo:
     version: 0.2-rc9
@@ -188,12 +206,11 @@ whawty_auth_instances:
       port: 3022
       authorized_keys: "{{ users.equinox.ssh }}"
     storage:
-      type: lvm
-      parent: *_lvm_thinpool_system_storage_
-      lv: whawty-auth-foo
-      size: 128M
-      fs: ext4
-      dest: /srv/whawty/auth/foo
+      type: zfs
+      parent: "{{ _whawty_auth_zfs_base_ }}"
+      name: foo
+      properties:
+        quota: 256M
     publish:
       zone: "{{ apps_publish_zone__ch_testvm_prometheus }}"
       hostnames:
@@ -229,12 +246,11 @@ whawty_auth_instances:
       port: 3122
       authorized_keys: "{{ users.equinox.ssh }}"
     storage:
-      type: lvm
-      parent: *_lvm_thinpool_system_storage_
-      lv: whawty-auth-bar
-      size: 128M
-      fs: ext4
-      dest: /srv/whawty/auth/bar
+      type: zfs
+      parent: "{{ _whawty_auth_zfs_base_ }}"
+      name: bar
+      properties:
+        quota: 128M
     publish:
       zone: "{{ apps_publish_zone__ch_testvm_prometheus }}"
       hostnames: