Infrastructure/ansible
5
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

openqa: try and fix on-disk encryption stuff

Browse source 
Some of the openqa workers are encrypted and some aren't (this is a bit of a
mess that's partly a result of all the redeployments we did around
https://bugzilla.redhat.com/show_bug.cgi?id=2009585 ). We should only run
the nbde_client role on workers which are encrypted. Hopefully this gets that
right.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-11-25 16:10:11 -08:00
parent e8e51b9709
commit 6aa77e9423
12 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
View file

@ -62,3 +62,5 @@ 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']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org
View file

@ -62,3 +62,5 @@ 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']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org
View file

@ -60,3 +60,5 @@ 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']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org
View file

@ -61,3 +61,5 @@ 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']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org
View file

@ -59,3 +59,5 @@ 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']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
View file

@ -70,3 +70,5 @@ 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', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
# this box is encrypted
openqa_nbde: true

2
inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org
View file

@ -68,3 +68,5 @@ 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', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org
View file

@ -68,3 +68,5 @@ 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', '20163', '20173', '20183', '20193', '20203', '20213', '20223']
# this box is encrypted
openqa_nbde: true

2
inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org
View file

@ -70,3 +70,5 @@ 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', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
# this box is not encrypted
openqa_nbde: false

2
inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org
View file

@ -68,3 +68,5 @@ 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', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
# this box is encrypted
openqa_nbde: true

2
inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org
View file

@ -67,3 +67,5 @@ 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', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
# this box is not encrypted
openqa_nbde: false

2
playbooks/groups/openqa-workers.yml
View file

@ -21,7 +21,7 @@
- { role: collectd/base, tags: ['collectd_base'] }
- { role: sudo, tags: ['sudo'] }
- { role: openqa/worker, tags: ['openqa_worker'] }
- { role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: datacenter == 'iad2' }
- { role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: openqa_nbde|bool }
- apache
tasks: