From be40e404a0bab9c8ea373c1628bb57f495f5f7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Thu, 7 Apr 2022 12:44:45 +0200
Subject: [PATCH] [FMN] Update fasjson configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new version of FMN is completely ported to python3, so we can remove some
python2 related things, also enable fasjson for staging.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 roles/notifs/backend/tasks/main.yml            | 2 +-
 roles/notifs/backend/templates/fmn.consumer.py | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/roles/notifs/backend/tasks/main.yml b/roles/notifs/backend/tasks/main.yml
index 94eac2104d..71218d0f88 100644
--- a/roles/notifs/backend/tasks/main.yml
+++ b/roles/notifs/backend/tasks/main.yml
@@ -55,7 +55,7 @@
   - tasks.py
   - util.py
   when:
-    inventory_hostname.startswith('notifs-backend01.iad')
+    inventory_hostname.startswith('notifs-backend01.iad') or env != 'staging'
   tags:
   - notifs
   - notifs/backend
diff --git a/roles/notifs/backend/templates/fmn.consumer.py b/roles/notifs/backend/templates/fmn.consumer.py
index a5fe5da260..3a85b65b36 100644
--- a/roles/notifs/backend/templates/fmn.consumer.py
+++ b/roles/notifs/backend/templates/fmn.consumer.py
@@ -91,21 +91,20 @@ config = {
     # The notification backend uses this to build a fas cache of ircnicks
     # to fas usernames so it can act appropriately on certain message types.
     {% if env == 'staging' -%}
-    "fas_credentials": {
-        "username": "{{fedoraDummyUser}}",
-        "password": "{{fedoraDummyUserPassword}}",
-        "base_url": "https://accounts.stg.fedoraproject.org",
+    "fasjson": {
+        "active": True,
+        "url": "https://fasjson.stg.fedoraproject.org/"
     },
     {% else -%}
     "fasjson": {
         "active": True,
         "url": "https://fasjson.fedoraproject.org/"
     },
+    {% endif %}
     "fas_credentials": {
         "username": "{{fedoraDummyUser}}",
         "password": "{{fedoraDummyUserPassword}}",
     },
-    {% endif %}
 
 
     ## Backend stuff ##