openqa/worker: use include_tasks not import_tasks

Using `when` with `import_tasks` doesn't actually skip the import
entirely, it just imports the tasks and skips them one by one.
Which reads oddly. `include_tasks` is properly dynamic so seems
better here.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-07-24 14:11:21 -07:00
parent 97234b1c83
commit a2bef634cf

View file

@ -128,10 +128,10 @@
service: name=rngd enabled=yes state=started
when: "openqa_rngd is defined and openqa_rngd"
- import_tasks: nfs-client.yml
- include_tasks: nfs-client.yml
when: openqa_hostname is defined and openqa_hostname != "localhost"
- import_tasks: tap-setup.yml
- include_tasks: tap-setup.yml
when: openqa_tap is defined and openqa_tap
# this is kinda lazy - we could have a separate openqa_swtpm var so we
@ -140,7 +140,7 @@
# conditionals to account for four possibilities rather than two) and
# for now it's fine to just assume the tap host(s) is/are also the
# swtpm host(s)
- import_tasks: swtpm-setup.yml
- include_tasks: swtpm-setup.yml
when: openqa_tap is defined and openqa_tap
- name: openQA client config
@ -155,7 +155,7 @@
tags:
- config
- import_tasks: createhdds.yml
- include_tasks: createhdds.yml
when: "inventory_hostname in groups['openqa_hdds_workers']"
- name: Enable and start worker services