diff options
| author | Michael Simacek <msimacek@redhat.com> | 2017-01-13 16:12:02 +0100 |
|---|---|---|
| committer | Michael Simacek <msimacek@redhat.com> | 2017-01-13 16:12:02 +0100 |
| commit | 52cbde4ee52905ac2fa2f441bf378772b43d265a (patch) | |
| tree | ec14f1a0a04d08fb362778073c9cfd5dfb010ea3 /roles | |
| parent | 7f0f327c3d7b78ce005d6abb4899aafce3c7819e (diff) | |
| download | ansible-52cbde4ee52905ac2fa2f441bf378772b43d265a.tar.gz ansible-52cbde4ee52905ac2fa2f441bf378772b43d265a.tar.xz ansible-52cbde4ee52905ac2fa2f441bf378772b43d265a.zip | |
Prepare koschei config for next version
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/koschei/backend/templates/config-backend.cfg.j2 | 37 | ||||
| -rw-r--r-- | roles/koschei/frontend/templates/config-frontend.cfg.j2 | 21 |
2 files changed, 49 insertions, 9 deletions
diff --git a/roles/koschei/backend/templates/config-backend.cfg.j2 b/roles/koschei/backend/templates/config-backend.cfg.j2 index 3c18d5ff9..e9d390875 100644 --- a/roles/koschei/backend/templates/config-backend.cfg.j2 +++ b/roles/koschei/backend/templates/config-backend.cfg.j2 @@ -24,10 +24,17 @@ config = { "topurl": "http://{{ koschei_kojipkgs }}", "weburl": "http://{{ koschei_koji_web }}/koji", "login_method": "krb_login", + {% if env == 'staging' %} {# 1.9 #} + "login_args": { + "keytab": "/etc/krb5.koschei_{{ inventory_hostname }}.keytab", + "principal": "koschei/{{ inventory_hostname }}@{{ ipa_realm }}", + }, + {% else %} "login_args": DictMergeWorkaround({ "keytab": "/etc/krb5.koschei_{{ inventory_hostname }}.keytab", "principal": "koschei/{{ inventory_hostname }}@{{ ipa_realm }}", }), + {% endif %} "session_opts": { "krb_rdns": False, }, @@ -72,7 +79,6 @@ config = { "logging": { "loggers": { "": { - "level": "DEBUG", "handlers": ["stderr", "email"], }, "fedmsg": { @@ -90,7 +96,11 @@ config = { }, }, }, + {% if env == 'staging' %} {# 1.9 #} + "plugins": ['pkgdb', 'fedmsg'], + {% else %} "plugins": ['pkgdb', 'fedmsg_publisher'], + {% endif %} "fedmsg": { {% if env == 'staging' %} "topic": "org.fedoraproject.stg.buildsys", @@ -102,6 +112,29 @@ config = { "enabled": True, "modname": "koschei", }, + "caching": { {# 1.9+ #} + "rpm_requires": { + "backend": "dogpile.cache.memcached", + "expiration_time": None, + "arguments": { + "url": "memcached01", + "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', @@ -111,7 +144,7 @@ config = { "topic_re": r'\.prod\.pkgdb\.', {% endif %} "sync_tracked": True, - "cache": { + "cache": { {# remove after 1.9 #} "backend": "dogpile.cache.memcached", "expiration_time": 300, "arguments": { diff --git a/roles/koschei/frontend/templates/config-frontend.cfg.j2 b/roles/koschei/frontend/templates/config-frontend.cfg.j2 index 11b818dfb..b9f74f4f4 100644 --- a/roles/koschei/frontend/templates/config-frontend.cfg.j2 +++ b/roles/koschei/frontend/templates/config-frontend.cfg.j2 @@ -39,12 +39,19 @@ config = { }, }, "plugins": ['pkgdb'], - "fedmsg": { - {% if env == 'staging' %} - "topic": "org.fedoraproject.stg.buildsys", - {% else %} - "topic": "org.fedoraproject.prod.buildsys", - {% endif %} + "caching": { {# 1.9+ #} + "plugin": { + "pkgdb": { + "users": { + "backend": "dogpile.cache.memcached", + "expiration_time": 300, + "arguments": { + "url": "memcached01:11211", + "distributed_lock": True, + }, + }, + }, + }, }, "pkgdb": { {% if env == 'staging' %} @@ -55,7 +62,7 @@ config = { "topic_re": r'\.prod\.pkgdb\.', {% endif %} "sync_tracked": True, - "cache": { + "cache": { {# remove in 1.9 #} "backend": "dogpile.cache.memcached", "expiration_time": 300, "arguments": { |