From 67d5f5c27727e04d8f8a5ed20e79d5706cbbf1cb Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 7 Jan 2024 00:08:17 +0100
Subject: refactor: storage roles

---
 chaos-at-home/ch-prometheus.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'chaos-at-home/ch-prometheus.yml')

diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index c632a905..d7dc2e87 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -14,8 +14,8 @@
   - role: apt-repo/spreadspace
   - role: nginx/base
   - role: monitoring/prometheus/exporter
-  - role: storage/luks/volumes
-  - role: storage/zfs/pools
+  - role: storage/luks/base
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: chaos-at-home/fileserver
   - role: vm/host/base
@@ -31,7 +31,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in luks_volumes.items() %}
+        {% for name, volume in luks_devices.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
@@ -58,7 +58,7 @@
         disk_primary{{ loop.index0 }}=$(basename $(realpath '{{ disk }}'))
         {{ disk_variables.append('$disk_primary'+(loop.index0| string)) -}}
         {% endfor %}
-        {% for name,volume in luks_volumes.items() %}
+        {% for name,volume in luks_devices.items() %}
         {%   if 'crypto-nvme' not in name %}
         disk_{{ name | replace('-', '_') }}=$(basename $(realpath '{{ volume.device }}'))
         {{ disk_variables.append('$disk_'+(name | replace('-', '_'))) -}}
-- 
cgit v1.2.3