Revert "Revert "Adjust the FMN roles and playbook for FMN 1.2""

This reverts commit b6baefa344.

Conflicts:
	playbooks/manual/upgrade/fmn.yml
	roles/notifs/backend/tasks/main.yml

playbooks/manual/upgrade/fmn.yml

@@ -15,7 +15,7 @@
     command: yum clean all {%if testing%} --enablerepo=infrastructure-testing {%endif%}
     check_mode: no
   - name: yum update FMN packages from main repo
-    yum: name="python-fmn-*" state=latest
+    yum: name="python-fmn*" state=latest
     when: not testing
   - name: yum update FMN packages from testing repo
     yum: pkg={{ item }} state=latest enablerepo=infrastructure-testing
@@ -80,10 +80,10 @@
     - fmn-worker@4
 
   - name: Upgrade the database
-    command: /usr/bin/alembic -c /usr/share/fmn.lib/alembic.ini upgrade head
+    command: /usr/bin/alembic -c /usr/share/fmn/alembic.ini upgrade head
     when: env != "staging"
     args:
-      chdir: /usr/share/fmn.lib/
+      chdir: /usr/share/fmn/
 
   - name: Re-start the workers and the backend
     service: name={{ item }} state=started

roles/notifs/backend/tasks/main.yml

@@ -4,9 +4,7 @@
 - name: install needed packages
   yum: pkg={{ item }} state=present
   with_items:
-  - python-fmn-consumer
-  - python-fmn-lib
-  - python-fmn-rules
+  - python-fmn
   - python-psycopg2
   - libsemanage-python
   # Needed to produce nice long emails about koji builds
@@ -18,7 +16,6 @@
 - name: install backend and sse packages
   yum: pkg={{ item }} state=present
   with_items:
-  - python-fmn
   - python-fmn-sse
   when: env == "staging"
   tags:
@@ -50,22 +47,10 @@
   - notifs
   - notifs/backend
 
-- name: copy the alembic configuration for DBAs
-  template: >
-    src=alembic.ini dest=/usr/share/fmn.lib/alembic.ini
-    owner=root group=sysadmin-dba mode=0660
-  when: env != "staging"
-  notify:
-  - restart fedmsg-hub
-  tags:
-  - notifs
-  - notifs/backend
-
 - name: copy the alembic configuration for DBAs
   template: >
     src=alembic.ini dest=/usr/share/fmn/alembic.ini
     owner=root group=sysadmin-dba mode=0660
-  when: env == "staging"
   notify:
   - restart fedmsg-hub
   tags:

roles/notifs/backend/templates/alembic.ini

@@ -2,11 +2,7 @@
 
 [alembic]
 # path to migration scripts
-{% if env == 'staging' %}
 script_location = /usr/share/fmn/alembic/
-{% else %}
-script_location = /usr/share/fmn.lib/alembic/
-{% endif %}
 
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s