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

openqa/dispatcher: correct openQA URL for resultsdb links

Browse source
This commit is contained in:
Adam Williamson 2017-02-06 15:45:56 -08:00
parent 74ba8433f4
commit 9d7f1465ef
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,9 @@
## bool - whether to enable the fedmsg consumer and run whenever ## bool - whether to enable the fedmsg consumer and run whenever
## a compose completes ## a compose completes
## default - true ## default - true
# - external_hostname
## string - The public hostname of the openQA server (used in ResultsDB links)
## default - ansible_nodename
# #
# Optional vars # Optional vars
# - wikitcms_user # - wikitcms_user
@ -21,9 +24,10 @@
# deployment_type is set to 'prod', results will be submitted to the # deployment_type is set to 'prod', results will be submitted to the
# production wiki in response to openQA production 'job complete' # production wiki in response to openQA production 'job complete'
# fedmsgs; if set to 'stg', results will be submitted to the staging # fedmsgs; if set to 'stg', results will be submitted to the staging
# wiki in response to openQA staging 'job complete' fedmsgs. You # wiki in response to openQA staging 'job complete' fedmsgs. Result
# probably should NOT set these unless you're maintaining the Fedora # reporting to ResultsDB will also be enabled for the production
# infrastructure deployments. # deployment. You probably should NOT set these unless you're
# maintaining the Fedora infrastructure deployments.
# #
# NOTE: There are still currently a couple of assumptions that the # NOTE: There are still currently a couple of assumptions that the
# openQA server boxes will always act as their own dispatchers, but # openQA server boxes will always act as their own dispatchers, but

4
roles/openqa/dispatcher/templates/schedule.conf.j2
View file

@ -1,7 +1,9 @@
[report] [report]
submit_resultsdb: false openqa_url: {{ external_hostname|default(ansible_nodename) }}
{% if wikitcms_user is defined and wikitcms_password is defined %} {% if wikitcms_user is defined and wikitcms_password is defined %}
submit_wiki: true submit_wiki: true
submit_resultsdb: true
{% else %} {% else %}
submit_wiki: false submit_wiki: false
submit_resultsdb: false
{% endif %} {% endif %}