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

Prepare koschei config for next version

Browse source
This commit is contained in:
Michael Simacek 2017-01-13 16:12:02 +01:00
parent 7f0f327c3d
commit 52cbde4ee5
2 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

37
roles/koschei/backend/templates/config-backend.cfg.j2
View file

@ -24,10 +24,17 @@ config = {
"topurl": "http://{{ koschei_kojipkgs }}", "topurl": "http://{{ koschei_kojipkgs }}",
"weburl": "http://{{ koschei_koji_web }}/koji", "weburl": "http://{{ koschei_koji_web }}/koji",
"login_method": "krb_login", "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({ "login_args": DictMergeWorkaround({
"keytab": "/etc/krb5.koschei_{{ inventory_hostname }}.keytab", "keytab": "/etc/krb5.koschei_{{ inventory_hostname }}.keytab",
"principal": "koschei/{{ inventory_hostname }}@{{ ipa_realm }}", "principal": "koschei/{{ inventory_hostname }}@{{ ipa_realm }}",
}), }),
{% endif %}
"session_opts": { "session_opts": {
"krb_rdns": False, "krb_rdns": False,
}, },
@ -72,7 +79,6 @@ config = {
"logging": { "logging": {
"loggers": { "loggers": {
"": { "": {
"level": "DEBUG",
"handlers": ["stderr", "email"], "handlers": ["stderr", "email"],
}, },
"fedmsg": { "fedmsg": {
@ -90,7 +96,11 @@ config = {
}, },
}, },
}, },
{% if env == 'staging' %} {# 1.9 #}
"plugins": ['pkgdb', 'fedmsg'],
{% else %}
"plugins": ['pkgdb', 'fedmsg_publisher'], "plugins": ['pkgdb', 'fedmsg_publisher'],
{% endif %}
"fedmsg": { "fedmsg": {
{% if env == 'staging' %} {% if env == 'staging' %}
"topic": "org.fedoraproject.stg.buildsys", "topic": "org.fedoraproject.stg.buildsys",
@ -102,6 +112,29 @@ config = {
"enabled": True, "enabled": True,
"modname": "koschei", "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": { "pkgdb": {
{% if env == 'staging' %} {% if env == 'staging' %}
"pkgdb_url": 'https://admin.stg.fedoraproject.org/pkgdb/api', "pkgdb_url": 'https://admin.stg.fedoraproject.org/pkgdb/api',
@ -111,7 +144,7 @@ config = {
"topic_re": r'\.prod\.pkgdb\.', "topic_re": r'\.prod\.pkgdb\.',
{% endif %} {% endif %}
"sync_tracked": True, "sync_tracked": True,
"cache": { "cache": { {# remove after 1.9 #}
"backend": "dogpile.cache.memcached", "backend": "dogpile.cache.memcached",
"expiration_time": 300, "expiration_time": 300,
"arguments": { "arguments": {

21
roles/koschei/frontend/templates/config-frontend.cfg.j2
View file

@ -39,12 +39,19 @@ config = {
}, },
}, },
"plugins": ['pkgdb'], "plugins": ['pkgdb'],
"fedmsg": { "caching": { {# 1.9+ #}
{% if env == 'staging' %} "plugin": {
"topic": "org.fedoraproject.stg.buildsys", "pkgdb": {
{% else %} "users": {
"topic": "org.fedoraproject.prod.buildsys", "backend": "dogpile.cache.memcached",
{% endif %} "expiration_time": 300,
"arguments": {
"url": "memcached01:11211",
"distributed_lock": True,
},
},
},
},
}, },
"pkgdb": { "pkgdb": {
{% if env == 'staging' %} {% if env == 'staging' %}
@ -55,7 +62,7 @@ config = {
"topic_re": r'\.prod\.pkgdb\.', "topic_re": r'\.prod\.pkgdb\.',
{% endif %} {% endif %}
"sync_tracked": True, "sync_tracked": True,
"cache": { "cache": { {# remove in 1.9 #}
"backend": "dogpile.cache.memcached", "backend": "dogpile.cache.memcached",
"expiration_time": 300, "expiration_time": 300,
"arguments": { "arguments": {