From 2083a05dace7a24ecdcc69f15dca1cdaa4987fba Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 9 Oct 2024 09:44:53 -0700 Subject: [PATCH] Make NBDE device configurable, fix it on single-disk openQA hosts Signed-off-by: Adam Williamson --- inventory/group_vars/all | 3 ++- inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org | 1 + inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index bd72c21385..cc2f0380b4 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -190,8 +190,9 @@ nagios_Check_Services: nat_rules: [] # default network block device encryption settings for linux-system-roles/nbde_client nbde: true +nbde_device: /dev/md2 nbde_client_bindings: - - device: /dev/md2 + - device: "{{ nbde_device }}" encryption_password: "{{ nbde_password }}" password_temporary: no threshold: 1 diff --git a/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org index 8bcf47c49e..ca4541f535 100644 --- a/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org +++ b/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org @@ -62,3 +62,4 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers" # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] +nbde_device: /dev/sda3 diff --git a/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org index 77cd609aec..38e54fc490 100644 --- a/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org +++ b/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org @@ -62,3 +62,4 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers" # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153'] +nbde_device: /dev/sda3