From f56b1ecd8330c2a70ee8ede10b2f7c0080cac209 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremy@jcline.org>
Date: Wed, 15 Nov 2017 18:12:11 +0000
Subject: [PATCH] Update FMN roles for 2.0.0

---
 playbooks/manual/upgrade/fmn.yml              | 19 ++------
 roles/notifs/backend/tasks/main.yml           |  8 ----
 .../notifs/backend/templates/fmn.consumer.py  | 43 -------------------
 3 files changed, 4 insertions(+), 66 deletions(-)

diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml
index 0adb358f2b..4eedc04e57 100644
--- a/playbooks/manual/upgrade/fmn.yml
+++ b/playbooks/manual/upgrade/fmn.yml
@@ -12,15 +12,10 @@
 
   tasks:
   - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%}
-    command: yum clean all {%if testing%} --enablerepo=infrastructure-tags-stg {%endif%}
+    command: dnf clean all
     check_mode: no
-    when: env != "staging"
   - name: yum update FMN packages from main repo
-    yum: name="python-fmn" state=latest
-    when: env != "staging"
-  - name: Update FMN packages
-    package: name=python-fmn state=latest
-    when: env == "staging"
+    package: name="python-fmn" state=latest
 
 - name: verify the frontend and stop it
   hosts: notifs-web:notifs-web-stg
@@ -75,10 +70,7 @@
     - fmn-worker@2
     - fmn-worker@3
     - fmn-worker@4
-
-  - name: Stop the celerybeat service
-    service: name=fmn-celerybeat state=stopped
-    when: env == "staging"
+    - fmn-celerybeat
 
   - name: Upgrade the database
     command: /usr/bin/alembic -c /usr/share/fmn/alembic.ini upgrade head
@@ -93,10 +85,7 @@
     - fmn-worker@2
     - fmn-worker@3
     - fmn-worker@4
-
-  - name: Re-start the celerybeat service
-    service: name=fmn-celerybeat state=started
-    when: env == "staging"
+    - fmn-celerybeat
 
   - name: And... start the backend again
     service: name="fedmsg-hub" state=started
diff --git a/roles/notifs/backend/tasks/main.yml b/roles/notifs/backend/tasks/main.yml
index 11416ad111..65323302c9 100644
--- a/roles/notifs/backend/tasks/main.yml
+++ b/roles/notifs/backend/tasks/main.yml
@@ -68,15 +68,7 @@
   - fmn-worker@2
   - fmn-worker@3
   - fmn-worker@4
-  tags:
-  - notifs
-  - notifs/backend
-
-- name: start the FMN celerybeat service
-  service: name={{item}} enabled=yes state=started
-  with_items:
   - fmn-celerybeat
   tags:
   - notifs
   - notifs/backend
-  when: env == "staging"
diff --git a/roles/notifs/backend/templates/fmn.consumer.py b/roles/notifs/backend/templates/fmn.consumer.py
index 030ec898d2..5ec0121e16 100644
--- a/roles/notifs/backend/templates/fmn.consumer.py
+++ b/roles/notifs/backend/templates/fmn.consumer.py
@@ -8,37 +8,6 @@ ircnick = "fedora-notif"
 
 base = "https://apps.%s/notifications/" % domain
 
-{% if env != 'staging' %}
-
-from dogpile.core.readwrite_lock import ReadWriteMutex
-from dogpile.cache.backends.file import AbstractFileLock
-
-class MutexLock(AbstractFileLock):
-    """ Use an in-memory lock for our dogpile cache
-    in an attempt to reduce thread competition.
-    """
-    def __init__(self, filename):
-        self.mutex = ReadWriteMutex()
-
-    def acquire_read_lock(self, wait):
-        ret = self.mutex.acquire_read_lock(wait)
-        return wait or ret
-
-    def acquire_write_lock(self, wait):
-        ret = self.mutex.acquire_write_lock(wait)
-        return wait or ret
-
-    def release_read_lock(self):
-        return self.mutex.release_read_lock()
-
-    def release_write_lock(self):
-        return self.mutex.release_write_lock()
-
-    @classmethod
-    def __json__(cls):
-        return repr(cls)
-{% endif %}
-
 
 config = {
     {% if env == 'staging' %}
@@ -181,7 +150,6 @@ config = {
     "fmn.support_email": "notifications@" + domain,
 
     # Generic stuff
-    {% if env == 'staging' %}
     "logging": dict(
         loggers=dict(
             fmn={
@@ -195,15 +163,4 @@ config = {
              'handlers': ['console', 'mailer'],
         },
     ),
-    {% else %}
-    "logging": dict(
-        loggers=dict(
-            fmn={
-                "level": "DEBUG",
-                "propagate": False,
-                "handlers": ["console", "mailer"],
-            },
-        ),
-    ),
-    {% endif %}
 }