From 78e5a1dbe3faf2e587c4daee6e26c577d42ddd65 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 6 Aug 2022 00:13:07 +0200
Subject: ch-prometheus: new nvme disk

---
 chaos-at-home/ch-prometheus.yml       | 4 +++-
 inventory/host_vars/ch-prometheus.yml | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index f0545d26..a736a331 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -51,11 +51,13 @@
         #!/bin/bash
         {% set disk_variables = [] %}
         {% for disk in install.disks.raid.members %}
-        disk_primary{{ loop.index0 }}=$(basename $(realpath '{{ install.disks.primary }}'))
+        disk_primary{{ loop.index0 }}=$(basename $(realpath '{{ disk }}'))
         {{ disk_variables.append('$disk_primary'+(loop.index0| string)) -}}
         {% endfor %}
         {% for name,volume in luks_volumes.items() %}
+        {%   if 'crypto-nvme' not in name %}
         disk_{{ name | replace('-', '_') }}=$(basename $(realpath '{{ volume.device }}'))
         {{ disk_variables.append('$disk_'+(name | replace('-', '_'))) -}}
+        {%   endif %}
         {% endfor %}
         exec dstat -cnd -N {{ network.primary.name }} -D "{{ disk_variables | join(',') }}"  --disk-util --top-io --top-bio
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index 25278ede..55f68ec0 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -10,7 +10,7 @@ install:
       level: 1
       members:
       - /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX0T354642E
-      - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310327Y
+      - /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNF1R804538A
   system_lvm:
     size: 25G
 
@@ -91,7 +91,7 @@ luks_volumes:
     device: /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX0T354642E-part4
   crypto-nvme1:
     passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}"
-    device: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310327Y-part4
+    device: /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNF1R804538A-part4
   crypto-sata0:
     passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6HGTN
-- 
cgit v1.2.3