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

openqa/dispatcher: tweak some conditionals

Browse source 
Use the |bool modifier, and add that check in some places where
we didn't currently have it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-05-19 12:36:11 -07:00
parent f4ed58da04
commit c77f42a409
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/openqa/dispatcher/tasks/main.yml
View file

@ -324,7 +324,7 @@
template: src=fedora_openqa_scheduler.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_scheduler.toml owner=root group=root mode=0640 template: src=fedora_openqa_scheduler.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_scheduler.toml owner=root group=root mode=0640
notify: notify:
- restart openqa scheduler consumer - restart openqa scheduler consumer
when: "openqa_amqp_scheduler_queue is defined" when: "openqa_amqp_scheduler_queue is defined and openqa_amqp_scheduler_queue|bool"
tags: tags:
- config - config
@ -332,7 +332,7 @@
template: src=fedora_openqa_wiki_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_wiki_reporter.toml owner=root group=root mode=0640 template: src=fedora_openqa_wiki_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_wiki_reporter.toml owner=root group=root mode=0640
notify: notify:
- restart openqa wiki consumer - restart openqa wiki consumer
when: "openqa_amqp_wiki_reporter_queue is defined" when: "openqa_amqp_wiki_reporter_queue is defined and openqa_amqp_wiki_reporter_queue|bool"
tags: tags:
- config - config
@ -340,21 +340,21 @@
template: src=fedora_openqa_resultsdb_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_resultsdb_reporter.toml owner=root group=root mode=0640 template: src=fedora_openqa_resultsdb_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_resultsdb_reporter.toml owner=root group=root mode=0640
notify: notify:
- restart openqa resultsdb consumer - restart openqa resultsdb consumer
when: "openqa_amqp_resultsdb_reporter_queue is defined" when: "openqa_amqp_resultsdb_reporter_queue is defined and openqa_amqp_resultsdb_reporter_queue|bool"
tags: tags:
- config - config
- name: Enable and start fedora-messaging scheduler service - name: Enable and start fedora-messaging scheduler service
service: name=fm-consumer@fedora_openqa_scheduler enabled=yes state=started service: name=fm-consumer@fedora_openqa_scheduler enabled=yes state=started
when: "openqa_amqp_scheduler_queue is defined and openqa_amqp_scheduler_queue" when: "openqa_amqp_scheduler_queue is defined and openqa_amqp_scheduler_queue|bool"
- name: Enable and start fedora-messaging wiki reporter service - name: Enable and start fedora-messaging wiki reporter service
service: name=fm-consumer@fedora_openqa_wiki_reporter enabled=yes state=started service: name=fm-consumer@fedora_openqa_wiki_reporter enabled=yes state=started
when: "openqa_amqp_wiki_reporter_queue is defined and openqa_amqp_wiki_reporter_queue" when: "openqa_amqp_wiki_reporter_queue is defined and openqa_amqp_wiki_reporter_queue|bool"
- name: Enable and start fedora-messaging ResultsDB reporter service - name: Enable and start fedora-messaging ResultsDB reporter service
service: name=fm-consumer@fedora_openqa_resultsdb_reporter enabled=yes state=started service: name=fm-consumer@fedora_openqa_resultsdb_reporter enabled=yes state=started
when: "openqa_amqp_resultsdb_reporter_queue is defined and openqa_amqp_resultsdb_reporter_queue" when: "openqa_amqp_resultsdb_reporter_queue is defined and openqa_amqp_resultsdb_reporter_queue|bool"
- name: Create directory for consumer service config drop-in - name: Create directory for consumer service config drop-in
file: path=/etc/systemd/system/fm-consumer@.service.d state=directory owner=root group=root mode=0755 file: path=/etc/systemd/system/fm-consumer@.service.d state=directory owner=root group=root mode=0755