diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index cbc4d0972b..483eb7ae13 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -15,10 +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={{ item }} state=latest - with_items: - - python-fmn - - python-fmn-web + 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 @@ -83,10 +80,10 @@ - fmn-worker@4 - name: Upgrade the database - command: /usr/bin/alembic -c /usr/share/fmn/alembic.ini upgrade head + command: /usr/bin/alembic -c /usr/share/fmn.lib/alembic.ini upgrade head when: env != "staging" args: - chdir: /usr/share/fmn/ + chdir: /usr/share/fmn.lib/ - name: Re-start the workers and the backend service: name={{ item }} state=started diff --git a/roles/notifs/backend/tasks/main.yml b/roles/notifs/backend/tasks/main.yml index 470956dbbe..4049940cda 100644 --- a/roles/notifs/backend/tasks/main.yml +++ b/roles/notifs/backend/tasks/main.yml @@ -4,7 +4,7 @@ - name: install needed packages yum: pkg={{ item }} state=present with_items: - - python-fmn + - python-fmn-consumer - python-psycopg2 - libsemanage-python # Needed to produce nice long emails about koji builds @@ -16,6 +16,7 @@ - name: install backend and sse packages yum: pkg={{ item }} state=present with_items: + - python-fmn - python-fmn-sse when: env == "staging" tags: @@ -47,10 +48,22 @@ - 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: diff --git a/roles/notifs/backend/templates/alembic.ini b/roles/notifs/backend/templates/alembic.ini index 266b83da24..df1506d215 100644 --- a/roles/notifs/backend/templates/alembic.ini +++ b/roles/notifs/backend/templates/alembic.ini @@ -2,7 +2,11 @@ [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