From 743e75249c774516f74b4bdbd5499b237b53e06f Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Wed, 29 May 2019 10:58:27 +0200
Subject: [PATCH] tag2distrepo is now fully koji-based

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 roles/bodhi2/backend/tasks/main.yml           | 18 ----------
 .../backend/templates/tag2distrepo.py.j2      | 33 -------------------
 roles/koji_hub/templates/hub.conf.j2          |  2 +-
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 roles/bodhi2/backend/templates/tag2distrepo.py.j2

diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 58111855e8..e754ab42c7 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -32,14 +32,6 @@
   - packages
   - bodhi
 
-- name: install tag2distrepo on fedora bodhi backends
-  package: name=python3-tag2distrepo state=present
-  when: inventory_hostname.startswith('bodhi-backend01.stg')
-  tags:
-  - packages
-  - bodhi
-  - tag2distrepo
-
 - name: install python3-ccolutils on fedora bodhi backends
   package: name=python3-cccolutils state=present
   tags:
@@ -424,16 +416,6 @@
   tags:
   - bodhi
 
-- name: Put in tag2distrepo config
-  template: >
-    src=tag2distrepo.py.j2
-    dest=/etc/fedmsg.d/tag2distrepo.py
-  when: inventory_hostname.startswith('bodhi-backend01.stg')
-  tags:
-  - config
-  - bodhi
-  - tag2distrepo
-
 - name: Install dist-repo-regen.py
   copy:
     src: dist-repo-regen.py
diff --git a/roles/bodhi2/backend/templates/tag2distrepo.py.j2 b/roles/bodhi2/backend/templates/tag2distrepo.py.j2
deleted file mode 100644
index 8617082c74..0000000000
--- a/roles/bodhi2/backend/templates/tag2distrepo.py.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-config = {
-{% if inventory_hostname.startswith('bodhi-backend02') %}
-    'tag2distrepo.enabled': True,
-{% else %}
-    'tag2distrepo.enabled': False,
-{% endif %}
-
-    'tag2distrepo.tags': {
-        'primary': {
-            'url': 'https://koji{{ env_suffix }}.fedoraproject.org/kojihub',
-            'authmethod': 'kerberos',
-            'principal': 'bodhi/bodhi{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }}',
-            'keytab': '/etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab',
-	    'options': {
-	    	'krb_rdns': False
-	    },
-
-            'tags': {
-                'f29-infra': ['47dd8ef9'],
-                'f29-infra-stg': ['47dd8ef9'],
-                'f30-infra': ['47dd8ef9'],
-                'f30-infra-stg': ['47dd8ef9'],
-                'epel6-infra': ['47dd8ef9'],
-                'epel6-infra-stg': ['47dd8ef9'],
-                'epel7-infra': ['47dd8ef9'],
-                'epel7-infra-stg': ['47dd8ef9'],
-                'f29-coreos-continuous': [],
-                'f30-coreos-continuous': [],
-                'coreos-pool': ['cfc659b9'],
-            }
-        }
-    }
-}
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index bc752491c3..0589800195 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -75,7 +75,7 @@ DisableNotifications = True
 
 #Plugins = koji-disable-builds-plugin
 #Plugins = darkserver-plugin
-Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild {% if env == "staging" %}tag2distrepo{% endif %}
+Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild tag2distrepo
 
 
 [policy]