Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openQA: remove swtpm-teardown now the work is done

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-12-06 14:18:46 -08:00
parent 7a5d7f59fb
commit 38888162ea
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/openqa/worker/tasks/main.yml
View file

@ -185,11 +185,6 @@
- packages - packages
when: openqa_tap|bool when: openqa_tap|bool
# teardown swtpm services, since os-autoinst does this for us since
# 7ae93f9f137b8cf7de22f0494a11ead5b7832e46
- include_tasks: swtpm-teardown.yml
when: "openqa_tap|bool and (deployment_type is defined and deployment_type == 'prod')"
- name: openQA client config - name: openQA client config
template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600 template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600
tags: tags:

8
roles/openqa/worker/tasks/swtpm-teardown.yml
View file

@ -1,8 +0,0 @@
- name: Remove openqa-swtpm service file
file: path=/etc/systemd/system/openqa-swtpm@.service state=absent
- name: Unload custom SELinux policy
command: semodule -r systemd-swtpm
- name: Remove custom SELinux policy file
file: path=/usr/local/share/selinux/systemd-swtpm.pp state=absent