From ca4cff82e9c611582f1f3a1675dc53fec2176d0b Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 20 Jan 2024 23:21:05 +0100
Subject: fix storage/zfs/base role

---
 chaos-at-home/ch-testvm-prometheus.yml       |  1 +
 inventory/host_vars/ch-testvm-prometheus.yml | 15 ++++++++-------
 roles/storage/zfs/base/defaults/main.yml     |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml
index eb8b41b8..d7fa23c2 100644
--- a/chaos-at-home/ch-testvm-prometheus.yml
+++ b/chaos-at-home/ch-testvm-prometheus.yml
@@ -11,6 +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
diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml
index c88b8481..dbd6c41a 100644
--- a/inventory/host_vars/ch-testvm-prometheus.yml
+++ b/inventory/host_vars/ch-testvm-prometheus.yml
@@ -15,12 +15,6 @@ install:
         size: 10g
         properties:
           'syncoid:sync': 'false'
-      sdb:
-        type: zfs
-        name: data
-        size: 10g
-        properties:
-          'syncoid:sync': 'false'
   interfaces:
   - bridge: br-svc
     name: svc0
@@ -51,10 +45,17 @@ apt_repo_components:
   - main
   - contrib  ## for zfs
 
+
+lvm_devices:
+  system/storage:
+    vg: "{{ host_name }}"
+    lv: storage
+    size: 5G
+
 zfs_pools:
   storage:
     mountpoint: /srv/storage
-    create_vdevs: /dev/sdb
+    create_vdevs: "/dev/{{ host_name }}/storage"
 
 zfs_volumes:
   storage:
diff --git a/roles/storage/zfs/base/defaults/main.yml b/roles/storage/zfs/base/defaults/main.yml
index 96fb3b73..80e4803d 100644
--- a/roles/storage/zfs/base/defaults/main.yml
+++ b/roles/storage/zfs/base/defaults/main.yml
@@ -49,7 +49,7 @@ zfs_volumes: {}
 #       properties:
 #         quota: 512M
 
-zfs_devices: {}
+zfs_devices: []
 
 # zfs_devices:
 #   - pool: storage
-- 
cgit v1.2.3