summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-08-06 00:13:07 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-08-06 00:13:07 +0200
commit78e5a1dbe3faf2e587c4daee6e26c577d42ddd65 (patch)
treeeb9f09094f4ccb1529bd8f901329320f892b5552
parentacmetool: new subscriber aggreement is not effect just yet. (diff)
ch-prometheus: new nvme disk
-rw-r--r--chaos-at-home/ch-prometheus.yml4
-rw-r--r--inventory/host_vars/ch-prometheus.yml4
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