diff options
| author | Michael Simacek <msimacek@redhat.com> | 2017-08-14 17:19:19 +0200 |
|---|---|---|
| committer | Michael Simacek <msimacek@redhat.com> | 2017-08-16 17:42:06 +0200 |
| commit | 890d01ce47dd80c43685926c51be8fbd9a6d93e8 (patch) | |
| tree | cb92ef9ebb7a4bbd7d06c960664195e221848d45 | |
| parent | 3cd0c523dd3caaa69ac6fc7539fbc46caa6c1005 (diff) | |
| download | ansible-890d01ce47dd80c43685926c51be8fbd9a6d93e8.tar.gz ansible-890d01ce47dd80c43685926c51be8fbd9a6d93e8.tar.xz ansible-890d01ce47dd80c43685926c51be8fbd9a6d93e8.zip | |
Disable koschei-pkgdb integration
| -rw-r--r-- | roles/koschei/backend/templates/config-backend.cfg.j2 | 26 | ||||
| -rw-r--r-- | roles/koschei/frontend/templates/config-frontend.cfg.j2 | 29 |
2 files changed, 4 insertions, 51 deletions
diff --git a/roles/koschei/backend/templates/config-backend.cfg.j2 b/roles/koschei/backend/templates/config-backend.cfg.j2 index 608cf3b40..57c665af9 100644 --- a/roles/koschei/backend/templates/config-backend.cfg.j2 +++ b/roles/koschei/backend/templates/config-backend.cfg.j2 @@ -85,9 +85,9 @@ config = { }, }, {% if env == 'staging' %} - "plugins": ['pkgdb', 'fedmsg', 'copr'], + "plugins": ['fedmsg', 'copr'], {% else %} - "plugins": ['pkgdb', 'fedmsg'], + "plugins": ['fedmsg'], {% endif %} "fedmsg": { {% if env == 'staging' %} @@ -109,28 +109,6 @@ config = { "distributed_lock": True, }, }, - "plugin": { - "pkgdb": { - "users": { - "backend": "dogpile.cache.memcached", - "expiration_time": 300, - "arguments": { - "url": "memcached01", - "distributed_lock": True, - }, - }, - }, - }, - }, - "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, }, "copr": { "require_admin": True, diff --git a/roles/koschei/frontend/templates/config-frontend.cfg.j2 b/roles/koschei/frontend/templates/config-frontend.cfg.j2 index d89d61894..a99b7ad83 100644 --- a/roles/koschei/frontend/templates/config-frontend.cfg.j2 +++ b/roles/koschei/frontend/templates/config-frontend.cfg.j2 @@ -39,36 +39,13 @@ config = { }, }, {% if env == 'staging' %} - "plugins": ['pkgdb', 'copr'], + "plugins": ['copr'], {% else %} - "plugins": ['pkgdb'], + "plugins": [], {% endif %} "caching": { - "plugin": { - "pkgdb": { - "users": { - "backend": "dogpile.cache.memcached", - "expiration_time": 300, - "arguments": { - "url": "memcached01:11211", - "distributed_lock": True, - }, - }, - }, - }, - }, - "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, }, "frontend": { - "auto_tracking": True, "builds_per_page": 8, "auth": { "user_re": "http://(.+)\\.id{{ env_prefix }}\\.fedoraproject\\.org/", @@ -89,8 +66,6 @@ config = { "links": [ {"name": "Packages", "url": "https://apps{{ env_prefix }}.fedoraproject.org/packages/{package.name}"}, - {"name": "PkgDB", - "url": "https://admin{{ env_prefix }}.fedoraproject.org/pkgdb/package/{package.name}"}, {"name": "Bodhi", "url": "https://bodhi{{ env_prefix }}.fedoraproject.org/updates?packages={package.name}"}, {"name": "Dist-git", |