diff --git a/playbooks/groups/koschei-backend.yml b/playbooks/groups/koschei-backend.yml index 50ca73d009..51c52e988d 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/playbooks/groups/koschei-backend.yml @@ -1,7 +1,7 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei:koschei-backend:koschei-backend-stg" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-backend:koschei-backend-stg" - name: install koschei - hosts: koschei:koschei-backend:koschei-backend-stg + hosts: koschei-backend:koschei-backend-stg user: root gather_facts: True @@ -22,7 +22,6 @@ - fedmsg/base - { role: openvpn/client, when: env != "staging" } - koschei/backend - - { role: koschei/frontend, when: env != "staging" } tasks: - include: "{{ tasks }}/yumrepos.yml" diff --git a/roles/koschei/backend/tasks/main.yml b/roles/koschei/backend/tasks/main.yml index 42ef681f7d..fea42086ab 100644 --- a/roles/koschei/backend/tasks/main.yml +++ b/roles/koschei/backend/tasks/main.yml @@ -1,17 +1,5 @@ - name: install packages package: name={{ item }} state=installed - when: env != "staging" - with_items: - - koschei - - lbzip2 - - postgresql - tags: - - koschei - - packages - -- name: install packages - package: name={{ item }} state=installed - when: env == "staging" with_items: - koschei-admin - koschei-backend @@ -50,7 +38,6 @@ - service - name: install config files - when: env == "staging" template: > src="{{ item }}.j2" dest="/etc/koschei/{{ item }}" @@ -69,25 +56,6 @@ - koschei - config -- name: install config files - when: env != "staging" - template: > - src="{{ item }}.j2" - dest="/etc/koschei/{{ item }}" - owner=koschei - group=koschei - mode=0400 - with_items: - - config.cfg - notify: - - restart koschei-polling - - restart koschei-resolver - - restart koschei-scheduler - - restart koschei-watcher - tags: - - koschei - - config - - name: install koschei fedmsg config copy: src=koschei.py dest=/etc/fedmsg.d/koschei.py notify: diff --git a/roles/koschei/backend/templates/config.cfg.j2 b/roles/koschei/backend/templates/config.cfg.j2 deleted file mode 100644 index ec01028d89..0000000000 --- a/roles/koschei/backend/templates/config.cfg.j2 +++ /dev/null @@ -1,161 +0,0 @@ -# This is a config file for Koschei that can override values in default -# configuration in /usr/share/koschei/config.cfg. It is a python file expecting -# assignment to config dictionary which will be recursively merged with the -# default one. -config = { - "database_config": { - "host": "{{ koschei_pgsql_hostname }}", - "username": "koscheiuser", - "password": "{{ koscheiuser_db_password }}", - "database": "koschei" - }, - "koji_config": { - "server": "http://{{ koschei_koji_hub }}/kojihub", - "topurl": "http://{{ koschei_kojipkgs }}", - "weburl": "http://{{ koschei_koji_web }}/koji", - "login_method": "ssl_login", - "login_args": { - "cert": "/etc/koschei/koschei.pem", - "ca": "/etc/koschei/fedora-ca.cert", - "serverca": "/etc/koschei/fedora-ca.cert", - }, - "source_tag": "{{ koschei_koji_tag }}", - "target_tag": "{{ koschei_koji_tag }}", - "build_tag": "{{ koschei_koji_tag }}-build", - "max_builds": 40, - "build_arches": ['i386', 'x86_64', 'armhfp'], - "build_opts": { - }, - "load_threshold": 0.65, - "task_priority": 30, - "repo_url": "http://{{ koschei_kojipkgs }}/repos/{build_tag}/{repo_id}/{arch}", - }, - "dependency": { - "build_group": "build", - "for_arch": "x86_64", - "repo_cache_items": 10, - "keep_build_deps_for": 1, - "local": False, - "arches": ['x86_64', 'i386'], - "persist_chunk_size": 300, - "resolver_queue_size": 100, - "dependency_fetch_chunk_size": 150, - "cache_l1_capacity": 4, - "cache_l2_capacity": 128, - "cache_l1_threads": 3, - "cache_l2_threads": 1, - "cache_threads_max": 4, - {% if env == 'staging' %} - "ignore_weak_deps": True, - {% endif %} - }, - "services": { - "watcher": { - {% if env == 'staging' %} - "watchdog_interval": None, # there are almost no messages in stg - {% else %} - "watchdog_interval": 600, # in seconds - {% endif %} - }, - "polling": { - {% if env == 'staging' %} - "interval": 1, # in seconds - {% else %} - "interval": 20*60, # in seconds - {% endif %} - }, - }, - "flask": { - "SECRET_KEY": "{{ koschei_flask_secret_key }}", - }, - "logging": { - "loggers": { - "": { - "level": "DEBUG", - "handlers": ["stderr", "email"], - }, - }, - "handlers": { - "email": { - "class": "logging.handlers.SMTPHandler", - "level": "WARN", - "mailhost": "localhost", - "fromaddr": "koschei@fedoraproject.org", - "toaddrs": ['sysadmin-koschei-members@fedoraproject.org'], - "subject": "Koschei {{ env }} warning", - }, - }, - }, - "fedmsg": { - {% if env == 'staging' %} - "topic": "org.fedoraproject.stg.buildsys", - {% else %} - "topic": "org.fedoraproject.prod.buildsys", - {% endif %} - }, - "fedmsg-publisher": { - "enabled": True, - "modname": "koschei", - }, - "pkgdb": { - {% if env == 'staging' %} - "pkgdb_url": 'https://admin.stg.fedoraproject.org/pkgdb/api', - "topic_re": r'\.stg\.pkgdb\.', - {% else %} - "pkgdb_url": 'https://admin.fedoraproject.org/pkgdb/api', - "topic_re": r'\.prod\.pkgdb\.', - {% endif %} - "sync_tracked": True, - "cache": { - "backend": "dogpile.cache.memcached", - "expiration_time": 300, - "arguments": { - "url": "memcached01", - "distributed_lock": True, - }, - }, - }, - "frontend": { - "auto_tracking": True, - {% if env == 'staging' %} - # Staging copies for fedmenu - "fedmenu_url": "https://apps.stg.fedoraproject.org/fedmenu", - "fedmenu_data_url": "https://apps.stg.fedoraproject.org/js/data.js", - {% else %} - # Production copies for fedmenu - "fedmenu_url": "https://apps.fedoraproject.org/fedmenu", - "fedmenu_data_url": "https://apps.fedoraproject.org/js/data.js", - {% endif %} - }, - "openid": { - "openid_provider": "{{ koschei_openid_provider }}", - }, - "bugreport": { - "url": "https://{{ koschei_bugzilla }}/enter_bug.cgi?%s", - "template": { - "product": "Fedora", - "component": "{name}", - "version": "rawhide", - "short_desc": "{name}: FTBFS in rawhide", - "bug_file_loc": "{{ koschei_topurl }}/package/{name}", - "comment": """ - Description of problem: - Package {name} fails to build from source in rawhide. - - Version-Release number of selected component (if applicable): - {version}-{release} - - Steps to Reproduce: - koji build --scratch {{ koschei_koji_tag }} {name}-{version}-{release}.{arch}.rpm - - Additional info: - This package is tracked by Koschei. See: - {{ koschei_topurl }}/package/{name}""" - }, - }, -} - -# Local Variables: -# mode: Python -# End: -# vi: ft=python diff --git a/roles/koschei/frontend/tasks/main.yml b/roles/koschei/frontend/tasks/main.yml index 575dc56c63..759b68a87a 100644 --- a/roles/koschei/frontend/tasks/main.yml +++ b/roles/koschei/frontend/tasks/main.yml @@ -1,17 +1,5 @@ - name: install packages package: name={{ item }} state=installed - when: env != "staging" - with_items: - - koschei - - lbzip2 - - postgresql - tags: - - koschei - - packages - -- name: install packages - package: name={{ item }} state=installed - when: env == "staging" with_items: - koschei-frontend - koschei-frontend-fedora