From fb51893a845378db5faf6fa1e4876342dce65498 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 14 Jul 2022 14:06:06 -0700 Subject: [PATCH] openqa/workers: skip nbde-client on a64 workers They aren't encrypted, and it causes networking config problems. We'd like to solve the underlying problem but we don't know how, this is good enough for now. Also drop the workaround things again because they don't seem to help. Signed-off-by: Adam Williamson --- playbooks/groups/openqa-workers.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index e8cc4021ab..ce43f5956b 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -12,22 +12,6 @@ - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - name: override nbde_client-network-flush to work around bug - copy: - src: "{{ files }}/common/nbde_client-network-flush" - dest: /usr/bin/nbde_client-network-flush - owner: root - group: root - mode: 755 - - - name: tell NetworkManager we don't want any auto connections - copy: - src: "{{ files }}/common/noautodefault.conf" - dest: /etc/NetworkManager/conf.d/noautodefault.conf - owner: root - group: root - mode: 644 - roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } @@ -37,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: datacenter == 'iad2' and not inventory_hostname.startswith 'openqa-a64' } - apache tasks: