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

check-compose: apparently no dashes in variable names? WHATEVS

Browse source
This commit is contained in:
Adam Williamson 2015-12-04 19:01:53 -08:00
parent 3becc32a39
commit 57601d915e
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inventory/group_vars/openqa
View file

@ -17,9 +17,9 @@ openqa_secret: "{{ prod_openqa_apisecret }}"
wikitcms_user: coconut wikitcms_user: coconut
wikitcms_password: "{{ prod_wikitcms_password }}" wikitcms_password: "{{ prod_wikitcms_password }}"
check-compose_email-from: rawhide@fedoraproject.org checkcompose_emailfrom: rawhide@fedoraproject.org
check-compose_email-to: "test@lists.fedoraproject.org devel@lists.fedoraproject.org" checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org"
check-compose_smtp: bastion.phx2.fedoraproject.org checkcompose_smtp: bastion.phx2.fedoraproject.org
deployment_type: prod deployment_type: prod

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

@ -1,18 +1,18 @@
# Optional vars # Optional vars
# - check-compose_wait # - checkcompose_wait
## string - (digits) time in minutes to wait for openQA tests to complete ## string - (digits) time in minutes to wait for openQA tests to complete
## before sending the report (defaults to 480) ## before sending the report (defaults to 480)
# - check-compose_email-from # - checkcompose_emailfrom
## string - Email address to send report from (if not set, no report sent) ## string - Email address to send report from (if not set, no report sent)
# - check-compose_email-to # - checkcompose_emailto
## string - Email address to send report to (if not set but email-from ## string - Email address to send report to (if not set but email-from
## set, report will go to email-from, for testing usually) ## set, report will go to email-from, for testing usually)
## Split multiple addresses with spaces ## Split multiple addresses with spaces
# - check-compose_smtp # - checkcompose_smtp
## string - SMTP server to use for sending the report ## string - SMTP server to use for sending the report
# - check-compose_json # - checkcompose_json
## string - File to append JSON-formatted report summary to ## string - File to append JSON-formatted report summary to
# - check-compose_loglevel # - checkcompose_loglevel
## string - log level ## string - log level
# #
# NOTE: this is missing /etc/openqa/client.conf configuration, for now; # NOTE: this is missing /etc/openqa/client.conf configuration, for now;

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

@ -1,19 +1,19 @@
[main] [main]
{% if check-compose_wait is defined %} {% if checkcompose_wait is defined %}
wait: {{ check-compose_wait }} wait: {{ check-compose_wait }}
{% endif %} {% endif %}
{% if check-compose_email-from is defined %} {% if checkcompose_emailfrom is defined %}
email-from: {{ check-compose_email-from }} email-from: {{ check-compose_emailfrom }}
{% endif %} {% endif %}
{% if check-compose_email-to is defined %} {% if checkcompose_emailto is defined %}
email-to: {{ check-compose_email-to }} email-to: {{ check-compose_emailto }}
{% endif %} {% endif %}
{% if check-compose_smtp is defined %} {% if checkcompose_smtp is defined %}
smtp: {{ check-compose_smtp }} smtp: {{ check-compose_smtp }}
{% endif %} {% endif %}
{% if check-compose_json is defined %} {% if checkcompose_json is defined %}
json: {{ check-compose_json }} json: {{ check-compose_json }}
{% endif %} {% endif %}
{% if check-compose_loglevel is defined %} {% if checkcompose_loglevel is defined %}
loglevel: {{ check-compose_loglevel }} loglevel: {{ check-compose_loglevel }}
{% endif %} {% endif %}