Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit b6baefa344.

Conflicts:
	playbooks/manual/upgrade/fmn.yml
	roles/notifs/backend/tasks/main.yml
This commit is contained in:
Jeremy Cline 2017-05-15 21:52:38 +00:00
parent 181c5f009c
commit 71de1cd8ea
3 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
playbooks/manual/upgrade/fmn.yml
View file

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

17
roles/notifs/backend/tasks/main.yml
View file

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

4
roles/notifs/backend/templates/alembic.ini
View file

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