From 10eb5d20f2bad04ae1f3c9ff97457b55fadd0722 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 19 Sep 2019 13:00:09 -0700
Subject: [PATCH] relvalconsumer: handle reporting image size bugs to Bugzilla

This relies on changes in relvalconsumer itself and relval.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 inventory/group_vars/relvalconsumer                  |  2 ++
 roles/relvalconsumer/tasks/main.yml                  | 12 ++++++++++++
 roles/relvalconsumer/templates/relvalconsumer.py.j2  |  9 ---------
 .../relvalconsumer/templates/relvalconsumer.toml.j2  |  5 +++++
 4 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 roles/relvalconsumer/templates/relvalconsumer.py.j2

diff --git a/inventory/group_vars/relvalconsumer b/inventory/group_vars/relvalconsumer
index 0995759fc1..2e8570c913 100644
--- a/inventory/group_vars/relvalconsumer
+++ b/inventory/group_vars/relvalconsumer
@@ -1,3 +1,5 @@
 # This var should never be set for more than one machine
 relvalconsumer_prod: true
+# this one probably shouldn't either
+relvalconsumer_bugzilla_api_key: "{{ prod_relvalconsumer_bugzilla_secret_api_key }}"
 relvalconsumer_env_suffix:
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index ed566b460d..66e898a5e8 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -64,6 +64,12 @@
 # - relvalconsumer_amqp_mailto
 ##        list - List of email addresses to email errors to. If set,
 ##               the email log handler will be configured.
+# - relvalconsumer_bugzilla_api_key
+##        string - An API key for Bugzilla. If relvalconsumer_prod and
+##                 this are both set, the consumer will be configured
+##                 to report bugs to Bugzilla for oversize images. As
+##                 with relvalconsumer_prod, only the 'official' prod
+##                 instance should have this set.
 
 # note: kept around for when we need packages from u-t
 #- name: Install required packages (testing)
@@ -160,6 +166,12 @@
   tags:
   - config
 
+- name: Write python-bugzilla configuration file
+  template: src=bugzillarc.j2 dest=/root/.config/python-bugzilla/bugzillarc owner=root group=root mode=0600
+  when: "relvalconsumer_bugzilla_api_key is defined"
+  tags:
+  - config
+
 - name: Configure fedora-messaging relvalconsumer
   template: src=relvalconsumer.toml.j2 dest=/etc/fedora-messaging/relvalconsumer.toml owner=root group=root mode=0640
   notify:
diff --git a/roles/relvalconsumer/templates/relvalconsumer.py.j2 b/roles/relvalconsumer/templates/relvalconsumer.py.j2
deleted file mode 100644
index 6b2c0c5756..0000000000
--- a/roles/relvalconsumer/templates/relvalconsumer.py.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-config = {
-{% if relvalconsumer_prod %}
-    'relvalconsumer.prod.enabled': True,
-    'relvalconsumer.test.enabled': False,
-{% else %}
-    'relvalconsumer.prod.enabled': False,
-    'relvalconsumer.test.enabled': True,
-{% endif %}
-}
diff --git a/roles/relvalconsumer/templates/relvalconsumer.toml.j2 b/roles/relvalconsumer/templates/relvalconsumer.toml.j2
index b01c71c0b1..53d011ddee 100644
--- a/roles/relvalconsumer/templates/relvalconsumer.toml.j2
+++ b/roles/relvalconsumer/templates/relvalconsumer.toml.j2
@@ -44,6 +44,11 @@ routing_keys = [{% for key in relvalconsumer_amqp_routing_keys %}"{{ key }}",{%
 
 [consumer_config]
 relval_prod = {{ relvalconsumer_prod|lower }}
+{% if relvalconsumer_bugzilla_api_key is defined and relval_prod is defined %}
+relval_bugzilla = true
+{% else %}
+relval_bugzilla = false
+{% endif %}
 
 [qos]
 prefetch_size = 0