More bodhi2 for fedora24 changes.

Fix places that except bodhi-backend01 for 03
Don't use the copr we can just use a scratch build
Set fedmsg enpoints

handlers/restart_services.yml

@@ -20,9 +20,9 @@
 - name: restart fedmsg-hub
   command: /usr/local/bin/conditional-restart.sh fedmsg-hub fedmsg-hub
   # Note that, we're cool with arbitrary restarts on bodhi-backend02, just
-  # not bodhi-backend01.  01 is where the releng/mash stuff happens and we
+  # not bodhi-backend01 or bodhi-backend03.  01 and 03 is where the releng/mash 
-  # don't want to interrupt that.
+  # stuff happens and we # don't want to interrupt that.
-  when: inventory_hostname != 'bodhi-backend01.phx2.fedoraproject.org'
+  when: inventory_hostname == 'bodhi-backend02.phx2.fedoraproject.org'
 
 - name: restart fedmsg-irc
   command: /usr/local/bin/conditional-restart.sh fedmsg-irc fedmsg-irc

roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo

@@ -1,8 +0,0 @@
-[bowlofeggs-bodhi]
-name=Copr repo for bodhi owned by bowlofeggs
-baseurl=https://copr-be.cloud.fedoraproject.org/results/bowlofeggs/bodhi/fedora-$releasever-$basearch/
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://copr-be.cloud.fedoraproject.org/results/bowlofeggs/bodhi/pubkey.gpg
-enabled=1
-enabled_metadata=1

roles/bodhi2/base/tasks/main.yml

@@ -14,18 +14,6 @@
   - bodhi
   when: ansible_distribution_major_version|int == 7
 
-- name: setup the bodhi2 copr repo
-  copy: >
-    src="bowlofeggs-bodhi2-fedora-24.repo"
-    dest="/etc/yum.repos.d/bowlofeggs-bodhi2-fedora-24.repo"
-    owner=root
-    group=root
-    mode=0644
-  tags:
-  - config
-  - bodhi
-  when: ansible_distribution_major_version|int == 24
-
 - name: install needed packages
   package: pkg={{ item }} state=present
   with_items:

roles/bodhi2/base/templates/masher.py

@@ -9,5 +9,9 @@ config = dict(
     # on bodhi-backend02.
     masher={{bodhi_masher_enabled}},
     masher_topic='bodhi.masher.start',
+{% if ansible_hostname == 'bodhi-backend01' %}
     releng_fedmsg_certname='shell-bodhi-backend01.%s' % suffix,
+{% else %}
+    releng_fedmsg_certname='shell-bodhi-backend03.%s' % suffix,
+{% endif %}
 )

roles/bodhi2/base/templates/production.ini.j2

@@ -97,7 +97,11 @@ message_id_email_domain = admin.fedoraproject.org
 ##
 
 # If defined, the bodhi masher will ensure that messages are signed with the given cert
+{% if ansible_hostname == 'bodhi-backend01' %}
 releng_fedmsg_certname = shell-bodhi-backend01.phx2.fedoraproject.org
+{% else %}
+releng_fedmsg_certname = shell-bodhi-backend03.phx2.fedoraproject.org
+{% endif %}
 
 # The masher is a bodhi instance that is responsible for composing the update
 # repositories, regenerating metrics, sending update notices, closing bugs,

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

@@ -11,6 +11,10 @@ config = dict(
             "tcp://bodhi-backend01.%s:30%0.2i" % (suffix, i)
             for i in range(20)
         ],
+        "bodhi.bodhi-backend03": [
+            "tcp://bodhi-backend03.%s:30%0.2i" % (suffix, i)
+            for i in range(20)
+        ],
         {% if env != 'staging' %}
         "bodhi.bodhi-backend02": [
             "tcp://bodhi-backend02.%s:30%0.2i" % (suffix, i)

roles/fedmsg/base/templates/logging.py.j2

@@ -176,7 +176,7 @@ config = dict(
         formatters=dict(
             bare={
                 "datefmt": "%Y-%m-%d %H:%M:%S",
-                {% if inventory_hostname.startswith('bodhi-backend01') %}
+                {% if inventory_hostname.startswith('bodhi-backend01','bodhi-backend03') %}
                 # Here we use a different format just so we can include
                 # threadName.  We set the threadName in the bodhi masher to some
                 # useful strings that will tell us which branch is doing what.