Some more changes. I was able to use a scratch build, so no copr needed. And some more fedmsg changes needed. (attached) also, I will need to run master with -t fedmsgdconfig since all the fedmsg enabled machines will need to update for the new endpoint. kevin -- diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index 62b3a25..a21fbd1 100644 --- a/handlers/restart_services.yml +++ b/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 - # don't want to interrupt that. - when: inventory_hostname != 'bodhi-backend01.phx2.fedoraproject.org' + # not bodhi-backend01 or bodhi-backend03. 01 and 03 is where the releng/mash + # stuff happens and we # don't want to interrupt that. + when: inventory_hostname == 'bodhi-backend02.phx2.fedoraproject.org' - name: restart fedmsg-irc command: /usr/local/bin/conditional-restart.sh fedmsg-irc fedmsg-irc diff --git a/roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo b/roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo deleted file mode 100644 index fdc5f32..0000000 --- a/roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo +++ /dev/null @@ -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 diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 3d6f613..d7947e7 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/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: diff --git a/roles/bodhi2/base/templates/masher.py b/roles/bodhi2/base/templates/masher.py index 5b0d359..3919a7c 100644 --- a/roles/bodhi2/base/templates/masher.py +++ b/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 %} ) diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 2685c08..3af5d5e 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/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, diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 index a69ac46..7238a8c 100644 --- a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 +++ b/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) diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2 index ac49794..184b45c 100644 --- a/roles/fedmsg/base/templates/logging.py.j2 +++ b/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.
Attachment:
pgpNSidghkkwr.pgp
Description: OpenPGP digital signature
_______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx https://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
