First try to update ODCS to latest version in staging.
ODCS in Fedora infra is quite outdated. This commit changes ODCS configuration files and playbook to match the latest uptream release.
This commit is contained in:
parent
2a9bb1cfde
commit
fa7ab62c96
6 changed files with 114 additions and 9 deletions
12
roles/odcs/base/files/logrotate.d/odcs
Normal file
12
roles/odcs/base/files/logrotate.d/odcs
Normal file
|
@ -0,0 +1,12 @@
|
|||
/var/log/odcs-backend/*.log {
|
||||
missingok
|
||||
notifempty
|
||||
compress
|
||||
delaycompress
|
||||
copytruncate
|
||||
daily
|
||||
dateext
|
||||
rotate 7
|
||||
size 50M
|
||||
}
|
||||
|
|
@ -23,7 +23,12 @@ sigkeys = [None]
|
|||
hashed_directories = True
|
||||
|
||||
# RUNROOT settings
|
||||
{%- if config.bootable %}
|
||||
runroot = True
|
||||
{%- else %}
|
||||
runroot = False
|
||||
{%- endif %}
|
||||
|
||||
|
||||
# PKGSET
|
||||
{%- if config.pkgset_source == 'repos' %}
|
||||
|
@ -67,7 +72,6 @@ pkgset_koji_builds = [
|
|||
]
|
||||
{%- endif %}
|
||||
|
||||
|
||||
{%- if config.source_type_str in ["tag", "build"] and not config.packages %}
|
||||
# In case no package is requested, include all of them.
|
||||
additional_packages = [
|
||||
|
@ -108,6 +112,7 @@ gather_lookaside_repos = [
|
|||
}),
|
||||
]
|
||||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_c = True
|
||||
createrepo_checksum = 'sha256'
|
||||
|
@ -133,12 +138,19 @@ skip_phases = [
|
|||
"live_images",
|
||||
"ostree"]
|
||||
|
||||
link_type = 'symlink'
|
||||
|
||||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
koji_profile = '{{ config.koji_profile }}'
|
||||
|
||||
dogpile_cache_backend = "dogpile.cache.dbm"
|
||||
dogpile_cache_arguments = {
|
||||
"filename": "/var/tmp/pungi_cache_file.dbm",
|
||||
}
|
||||
dogpile_cache_expiration_time = 14400
|
||||
|
||||
repoclosure_strictness = [('.*', {'*': 'off'})]
|
||||
|
||||
{%- if config.include_devel_modules %}
|
||||
|
@ -148,3 +160,4 @@ include_devel_modules = { "Temporary": [
|
|||
{%- endfor%}
|
||||
]}
|
||||
{%- endif %}
|
||||
|
||||
|
|
3
roles/odcs/base/files/tmpfiles.d/odcs-backend.conf
Normal file
3
roles/odcs/base/files/tmpfiles.d/odcs-backend.conf
Normal file
|
@ -0,0 +1,3 @@
|
|||
d /var/run/odcs-backend 0755 odcs fedmsg -
|
||||
d /var/log/odcs-backend 0755 odcs fedmsg -
|
||||
|
|
@ -3,3 +3,8 @@
|
|||
service:
|
||||
name: fedmsg-hub-3
|
||||
state: restarted
|
||||
- name: restart odcs-celery-backend
|
||||
service:
|
||||
name: odcs-celery-backend
|
||||
state: restarted
|
||||
|
||||
|
|
|
@ -42,8 +42,6 @@
|
|||
state: present
|
||||
with_items:
|
||||
- koji
|
||||
- libmodulemd
|
||||
- pdc-client
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
|
@ -78,7 +76,7 @@
|
|||
group: fedmsg
|
||||
mode: 0440
|
||||
notify:
|
||||
- restart fedmsg-hub
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
|
@ -92,7 +90,7 @@
|
|||
group: fedmsg
|
||||
mode: 0440
|
||||
notify:
|
||||
- restart fedmsg-hub-3
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
|
@ -106,7 +104,7 @@
|
|||
group: fedmsg
|
||||
mode: 0440
|
||||
notify:
|
||||
- restart fedmsg-hub-3
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
|
@ -117,7 +115,7 @@
|
|||
path: /etc/fedmsg.d/odcs.py
|
||||
state: absent
|
||||
notify:
|
||||
- restart fedmsg-hub-3
|
||||
- restart odcs-celery-backend
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
@ -130,8 +128,58 @@
|
|||
group: fedmsg
|
||||
mode: 0640
|
||||
notify:
|
||||
- restart fedmsg-hub-3
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
||||
- name: copy the odcs-celery-backend.service file.
|
||||
copy:
|
||||
src: "{{ roles_path }}/odcs/base/files/etc/systemd/system/odcs-celery-backend.service.j2"
|
||||
dest: /etc/systemd/system/odcs-celery-backend.service
|
||||
owner: odcs
|
||||
group: fedmsg
|
||||
mode: 0640
|
||||
notify:
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
||||
- name: enable ODCS backend (odcs-celery-backend)
|
||||
systemd:
|
||||
name: odcs-celery-backend
|
||||
enabled: yes
|
||||
daemon_reload: yes
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
||||
- name: copy the odcs-backend.conf tmpfiles.d file.
|
||||
copy:
|
||||
src: "{{ roles_path }}/odcs/base/files/etc/tmpfiles.d/odcs-backend.conf"
|
||||
dest: /etc/tmpfiles.d/odcs-backend.conf
|
||||
owner: odcs
|
||||
group: fedmsg
|
||||
mode: 0640
|
||||
notify:
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
||||
- name: Run systemd-tmpfiles --create
|
||||
command: systemd-tmpfiles --create
|
||||
args:
|
||||
creates: /var/run/odcs-backend
|
||||
notify:
|
||||
- restart odcs-celery-backend
|
||||
when: inventory_hostname.startswith('odcs-backend')
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
[Unit]
|
||||
Description=ODCS Celery backend service
|
||||
After=network.target remote-fs.target nss-lookup.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
User=odcs
|
||||
Group=fedmsg
|
||||
WorkingDirectory=/tmp
|
||||
ExecStart=/bin/sh -c '/usr/bin/celery multi start worker \
|
||||
-A odcs.server.celery_tasks --pidfile=/var/run/odcs-backend/%%n.pid \
|
||||
--max-tasks-per-child=10 \
|
||||
--logfile=/var/log/odcs-backend/%%n%%I.log --loglevel=INFO --concurrency={{ odcs_celery_concurrency }} -Q {{ odcs_celery_queues|join(',') }}'
|
||||
ExecStop=/bin/sh -c '/usr/bin/celery multi stopwait worker \
|
||||
--pidfile=/var/run/odcs-backend/%%n.pid'
|
||||
ExecReload=/bin/sh -c '/usr/bin/celery multi restart worker \
|
||||
-A odcs.server.celery_tasks --pidfile=/var/run/odcs-backend/%%n.pid \
|
||||
--max-tasks-per-child=10 \
|
||||
--logfile=/var/log/odcs-backend/%%n%%I.log --loglevel=INFO --concurrency={{ odcs_celery_concurrency }} -Q {{ odcs_celery_queues|join(',') }}'
|
||||
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue