Hubs: actually use the local fedmsg-relay (python2)

roles/hubs/handlers/main.yml

@@ -6,11 +6,6 @@
   listen: "hubs configuration change"
   when: not hubs_dev_mode
 
-- name: restart the hubs-specific fedmsg-relay
-  service: name=hubs-fedmsg-relay state=restarted
-  listen: "hubs configuration change"
-  when: not hubs_dev_mode
-
 - name: restart hubs triage
   service: name=hubs-triage@* state=restarted
   listen: "hubs configuration change"

roles/hubs/tasks/main.yml

@@ -167,7 +167,6 @@
   service: name={{ item }} state=stopped enabled=no
   with_items:
     - fedmsg-hub
-    - fedmsg-relay
 
 
 # Include mode-specific tasks

roles/hubs/tasks/prod.yml

@@ -7,7 +7,6 @@
     - hubs-worker@
     - hubs-sse
     - hubs-fedmsg-hub
-    - hubs-fedmsg-relay
   register: service_installed
 
 - name: reload systemd
@@ -17,12 +16,12 @@
 - name: Start and enable the services in prod mode
   service: name={{ item }} state=started enabled=yes
   with_items:
+    - fedmsg-relay
     - hubs-triage@1
     - hubs-triage@2
     - hubs-worker@1
     - hubs-worker@2
     - hubs-sse
     - hubs-fedmsg-hub
-    - hubs-fedmsg-relay
 
 - include_tasks: webserver.yml

roles/hubs/templates/hubs-fedmsg-relay.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Hubs-specific fedmsg processing relay
-After=network.target
-Documentation=https://fedmsg.readthedocs.org/
-
-[Service]
-ExecStart={{ hubs_venv_dir }}/bin/python /usr/bin/fedmsg-relay
-Type=simple
-User=fedmsg
-Group=fedmsg
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target