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

openqa/dispatcher: fix ansible-lint detected errors

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-04-29 16:49:32 -07:00
parent 5e10e633fd
commit 7278d3f451
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/openqa/dispatcher/handlers/main.yml
View file

@ -1,18 +1,18 @@
# Restart handler for our fedora-messaging consumers # Restart handler for our fedora-messaging consumers
- name: Conditionally restart openQA scheduler consumer - name: Conditionally restart openQA scheduler consumer
command: /usr/local/bin/conditional-restart.sh fm-consumer@fedora_openqa_scheduler command: /usr/local/bin/conditional-restart.sh fm-consumer@fedora_openqa_scheduler
listen: listen:
- restart openqa consumers - restart openqa consumers
- restart openqa scheduler consumer - restart openqa scheduler consumer
- name: Conditionally restart openQA ResultsDB reporter consumer - name: Conditionally restart openQA ResultsDB reporter consumer
command: /usr/local/bin/conditional-restart.sh fm-consumer@fedora_openqa_resultsdb_reporter command: /usr/local/bin/conditional-restart.sh fm-consumer@fedora_openqa_resultsdb_reporter
listen: listen:
- restart openqa consumers - restart openqa consumers
- restart openqa resultsdb consumer - restart openqa resultsdb consumer
- name: Conditionally restart openQA wiki reporter consumer - name: Conditionally restart openQA wiki reporter consumer
command: /usr/local/bin/conditional-restart.sh fm-consumer@fedora_openqa_wiki_reporter command: /usr/local/bin/conditional-restart.sh fm-consumer@fedora_openqa_wiki_reporter
listen: listen:
- restart openqa consumers - restart openqa consumers
- restart openqa wiki consumer - restart openqa wiki consumer

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

@ -189,7 +189,7 @@
# branch, as that usually means we're messing around on staging and # branch, as that usually means we're messing around on staging and
# don't want the checkout reset to HEAD. # don't want the checkout reset to HEAD.
- name: Check if tests are checked out and on a non-standard branch - name: Check if tests are checked out and on a non-standard branch
command: "git status" command: "git status" # noqa 303
args: args:
chdir: /root/fedora_openqa chdir: /root/fedora_openqa
register: toolsbranch register: toolsbranch
@ -199,7 +199,7 @@
- name: Check out fedora_openqa (scheduler / reporter tool) - name: Check out fedora_openqa (scheduler / reporter tool)
git: git:
repo: https://pagure.io/fedora-qa/fedora_openqa.git repo: https://pagure.io/fedora-qa/fedora_openqa.git # noqa 401
dest: /root/fedora_openqa dest: /root/fedora_openqa
register: gittools register: gittools
when: "(toolsbranch.stderr.find('Not a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)" when: "(toolsbranch.stderr.find('Not a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)"
@ -278,8 +278,8 @@
- name: Deploy the Fedora infra fedora-messaging cert - name: Deploy the Fedora infra fedora-messaging cert
copy: copy:
src: "{{ private }}/files/rabbitmq/{{openqa_env}}/pki/issued/openqa{{openqa_env_suffix}}.crt" src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/issued/openqa{{ openqa_env_suffix }}.crt"
dest: /etc/pki/fedora-messaging/openqa{{openqa_env_suffix}}-cert.pem dest: /etc/pki/fedora-messaging/openqa{{ openqa_env_suffix }}-cert.pem
mode: 0644 mode: 0644
owner: root owner: root
group: root group: root
@ -289,8 +289,8 @@
- name: Deploy the Fedora infra fedora-messaging key - name: Deploy the Fedora infra fedora-messaging key
copy: copy:
src: "{{ private }}/files/rabbitmq/{{openqa_env}}/pki/private/openqa{{openqa_env_suffix}}.key" src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/private/openqa{{ openqa_env_suffix }}.key"
dest: /etc/pki/fedora-messaging/openqa{{openqa_env_suffix}}-key.pem dest: /etc/pki/fedora-messaging/openqa{{ openqa_env_suffix }}-key.pem
mode: 0640 mode: 0640
owner: root owner: root
group: geekotest group: geekotest
@ -308,7 +308,7 @@
when: "deployment_type is defined and deployment_type == 'stg'" when: "deployment_type is defined and deployment_type == 'stg'"
tags: tags:
- config - config
- name: Deploy the Fedora infra fedora-messaging prod key on stg (for scheduler) - name: Deploy the Fedora infra fedora-messaging prod key on stg (for scheduler)
copy: copy:
src: "{{ private }}/files/rabbitmq/production/pki/private/openqa.key" src: "{{ private }}/files/rabbitmq/production/pki/private/openqa.key"