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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2015-08-18 23:47:21 +00:00
commit 851765eefb
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/taskotron-dev-clients
View file

@ -7,7 +7,7 @@ slave_user: buildslave
taskotron_fas_user: taskotron taskotron_fas_user: taskotron
execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb
resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi bodhi_server: https://bodhi.stg.fedoraproject.org/
kojihub_url: http://koji.fedoraproject.org/kojihub kojihub_url: http://koji.fedoraproject.org/kojihub
taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster
resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb

6
roles/fedmsg/base/templates/endpoints-bodhi.py.j2
View file

@ -7,13 +7,13 @@ suffix = 'phx2.fedoraproject.org'
config = dict( config = dict(
endpoints={ endpoints={
"bodhi.bodhi-backend01.%s" % suffix: [ "bodhi.bodhi-backend01": [
"tcp://bodhi-backend01.%s:30%0.2i" % (suffix, i) "tcp://bodhi-backend01.%s:30%0.2i" % (suffix, i)
for i in range(10) for i in range(10)
], ],
{% if env != 'staging' %} {% if env != 'staging' %}
"bodhi.bodhi-backend01.%s" % suffix: [ "bodhi.bodhi-backend02": [
"tcp://bodhi-backend01.%s:30%0.2i" % (suffix, i) "tcp://bodhi-backend02.%s:30%0.2i" % (suffix, i)
for i in range(10) for i in range(10)
], ],
{% endif %} {% endif %}

6
roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
View file

@ -33,7 +33,11 @@ reporting_enabled: True
## If True, test results (for selected tests) will be sent as comments to ## If True, test results (for selected tests) will be sent as comments to
## Fedora Update System (Bodhi). This requires that you have Bodhi ## Fedora Update System (Bodhi). This requires that you have Bodhi
## credentials filled in secrets.conf. ## credentials filled in secrets.conf.
#report_to_bodhi: True {% if deployment_type == 'dev' %}
report_to_bodhi: False
{% else %}
report_to_bodhi: True
{% endif %}
## Whether to send test results to the configured ResultsDB server. ## Whether to send test results to the configured ResultsDB server.
report_to_resultsdb: True report_to_resultsdb: True