infrastructure/ansible
2
0
Fork 0
Code Pull requests 7 Activity Actions

Update check-compose role for Greenwave integration

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-12-05 19:33:06 -08:00
parent 846d74373e
commit ed6fb9c465
4 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/openqa
View file

@ -34,6 +34,7 @@ checkcompose_atomic_emailto: "dusty@dustymabe.com walters@verbum.org atomic@list
checkcompose_atomic_emailerror: "true" checkcompose_atomic_emailerror: "true"
checkcompose_smtp: bastion.phx2.fedoraproject.org checkcompose_smtp: bastion.phx2.fedoraproject.org
checkcompose_url: "https://{{ external_hostname }}" checkcompose_url: "https://{{ external_hostname }}"
checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.fedoraproject.org
deployment_type: prod deployment_type: prod
freezes: false freezes: false

1
inventory/group_vars/openqa-stg
View file

@ -41,6 +41,7 @@ wikitcms_password: "{{ stg_wikitcms_password }}"
wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json" wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json"
checkcompose_url: "https://{{ external_hostname }}" checkcompose_url: "https://{{ external_hostname }}"
checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.stg.fedoraproject.org
deployment_type: stg deployment_type: stg
freezes: false freezes: false

4
roles/check-compose/tasks/main.yml
View file

@ -31,7 +31,9 @@
# NOTE: this is missing /etc/openqa/client.conf configuration, for now; # NOTE: this is missing /etc/openqa/client.conf configuration, for now;
# we're assuming it'll be deployed on the openqa server boxes and hence # we're assuming it'll be deployed on the openqa server boxes and hence
# client.conf will be in place (and localhost default would be correct # client.conf will be in place (and localhost default would be correct
# anyhow) # anyhow). We also get lazy and assume fedora_openqa will be installed
# by openqa/dispatcher role; ideally we should factor this out into a
# shared task or something.
#- name: Install required packages (testing) #- name: Install required packages (testing)
# dnf: name={{ item }} state=present enablerepo="updates-testing" # dnf: name={{ item }} state=present enablerepo="updates-testing"

3
roles/check-compose/templates/check-compose.conf.j2
View file

@ -5,6 +5,9 @@ server: {{ checkcompose_server }}
{% if checkcompose_url is defined %} {% if checkcompose_url is defined %}
url: {{ checkcompose_url }} url: {{ checkcompose_url }}
{% endif %} {% endif %}
{% if checkcompose_greenwaveurl is defined %}
greenwave-url: {{ checkcompose_greenwaveurl }}
{% endif %}
{% if checkcompose_wait is defined %} {% if checkcompose_wait is defined %}
wait: {{ checkcompose_wait }} wait: {{ checkcompose_wait }}
{% endif %} {% endif %}