diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index 5a4f334085..da87403149 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -6,6 +6,9 @@ ## bool - whether to enable the fedmsg consumer and run whenever ## a compose completes ## default - true +# - external_hostname +## string - The public hostname of the openQA server (used in ResultsDB links) +## default - ansible_nodename # # Optional vars # - wikitcms_user @@ -21,9 +24,10 @@ # deployment_type is set to 'prod', results will be submitted to the # production wiki in response to openQA production 'job complete' # fedmsgs; if set to 'stg', results will be submitted to the staging -# wiki in response to openQA staging 'job complete' fedmsgs. You -# probably should NOT set these unless you're maintaining the Fedora -# infrastructure deployments. +# wiki in response to openQA staging 'job complete' fedmsgs. Result +# reporting to ResultsDB will also be enabled for the production +# 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 # openQA server boxes will always act as their own dispatchers, but diff --git a/roles/openqa/dispatcher/templates/schedule.conf.j2 b/roles/openqa/dispatcher/templates/schedule.conf.j2 index 6b7156c5bf..b7fdf2e060 100644 --- a/roles/openqa/dispatcher/templates/schedule.conf.j2 +++ b/roles/openqa/dispatcher/templates/schedule.conf.j2 @@ -1,7 +1,9 @@ [report] -submit_resultsdb: false +openqa_url: {{ external_hostname|default(ansible_nodename) }} {% if wikitcms_user is defined and wikitcms_password is defined %} submit_wiki: true +submit_resultsdb: true {% else %} submit_wiki: false +submit_resultsdb: false {% endif %}