From 67d5f5c27727e04d8f8a5ed20e79d5706cbbf1cb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 7 Jan 2024 00:08:17 +0100 Subject: refactor: storage roles --- inventory/host_vars/ch-epimetheus.yml | 12 ++++++------ inventory/host_vars/ch-prometheus.yml | 12 ++++++------ inventory/host_vars/ele-media.yml | 2 +- inventory/host_vars/sk-2019.yml | 6 +++--- inventory/host_vars/sk-2019vm.yml | 6 +++--- inventory/host_vars/sk-tomnext.yml | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'inventory') diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml index a2126abd..5188940b 100644 --- a/inventory/host_vars/ch-epimetheus.yml +++ b/inventory/host_vars/ch-epimetheus.yml @@ -53,18 +53,18 @@ prometheus_job_multitarget_ssl__probe: module: file -luks_volumes: +luks_devices: crypto-sata0: - passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata0'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZGY976JP crypto-sata1: - passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata1'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZDHAVYJT crypto-sata2: - passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata2'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZGY9802C crypto-sata3: - passphrase: "{{ vault_luks_volumes['crypto-sata3'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata3'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZDHADPQL @@ -101,7 +101,7 @@ zfs_sanoid_modules: zfs_syncoid_autosuspend: disks -zfs_syncoid_autosuspend_disks: "{{ luks_volumes | dict2items | map(attribute='value.device') }}" +zfs_syncoid_autosuspend_disks: "{{ luks_devices | dict2items | map(attribute='value.device') }}" zfs_syncoid_target_pool: backup zfs_syncoid_sources: 'ch-prometheus': diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml index 88a4784f..3bdeac5d 100644 --- a/inventory/host_vars/ch-prometheus.yml +++ b/inventory/host_vars/ch-prometheus.yml @@ -84,21 +84,21 @@ installer_storage: fs: ext4 -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX0T354642E-part4 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNF1R804538A-part4 crypto-sata0: - passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata0'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6HGTN crypto-sata1: - passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata1'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD121KRYZ-01W0RB0_5QHUESHB crypto-sata2: - passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata2'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6A2UN diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 6b071894..a2f6ef90 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -134,7 +134,7 @@ elevate_media_nextcloud_storage: elevate_media_nextcloud_instance_name: media.elev8.at elevate_media_nextcloud_instance: - version: 27.1.2 + version: 28.0.1 port: 8100 hostnames: - media.elev8.at diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml index d964f124..ed9b490a 100644 --- a/inventory/host_vars/sk-2019.yml +++ b/inventory/host_vars/sk-2019.yml @@ -30,12 +30,12 @@ apt_repo_components: - non-free ## for microcode updates -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-eui.0025388791050fef-part3 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-eui.002538bc21a02d15-part3 diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index 54205118..06a4b252 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -37,12 +37,12 @@ apt_repo_components: - non-free-firmware -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-eui.0025388291b201dc-part3 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-eui.0025388291b201cb-part3 diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml index 036aea44..54ea19f3 100644 --- a/inventory/host_vars/sk-tomnext.yml +++ b/inventory/host_vars/sk-tomnext.yml @@ -32,12 +32,12 @@ apt_repo_components: - non-free-firmware -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-eui.00000000000000018ce38e0500157a42-part3 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-eui.00000000000000018ce38e0500157b3d-part3 -- cgit v1.2.3