Merge branch 'master' of /git/ansible

inventory/group_vars/taskotron-dev-clients

@@ -7,7 +7,7 @@ slave_user: buildslave
 taskotron_fas_user: taskotron
 execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb
 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
 taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster
 resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb

roles/fedmsg/base/templates/endpoints-bodhi.py.j2

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

roles/taskotron/taskotron-client/templates/taskotron.yaml.j2

@@ -33,7 +33,11 @@ reporting_enabled: True
 ## If True, test results (for selected tests) will be sent as comments to
 ## Fedora Update System (Bodhi). This requires that you have Bodhi
 ## 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.
 report_to_resultsdb: True