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

Switch Koschei prod to kerberos auth against Koji

Browse source
This commit is contained in:
Mikolaj Izdebski 2016-12-02 13:31:50 +00:00
parent d1a6f2b69e
commit 0336b94ea6
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,8 +23,6 @@ config = {
"server": "http://{{ koschei_koji_hub }}/kojihub", "server": "http://{{ koschei_koji_hub }}/kojihub",
"topurl": "http://{{ koschei_kojipkgs }}", "topurl": "http://{{ koschei_kojipkgs }}",
"weburl": "http://{{ koschei_koji_web }}/koji", "weburl": "http://{{ koschei_koji_web }}/koji",
{% if env == 'staging' %}
{# staging will use kerberos #}
"login_method": "krb_login", "login_method": "krb_login",
"login_args": DictMergeWorkaround({ "login_args": DictMergeWorkaround({
"keytab": "/etc/krb5.koschei_{{ inventory_hostname }}.keytab", "keytab": "/etc/krb5.koschei_{{ inventory_hostname }}.keytab",
@ -33,15 +31,6 @@ config = {
"session_opts": { "session_opts": {
"krb_rdns": False, "krb_rdns": False,
}, },
{% else %}
{# prod still uses ssl #}
"login_method": "ssl_login",
"login_args": {
"cert": "/etc/koschei/koschei.pem",
"ca": "/etc/koschei/fedora-ca.cert",
"serverca": "/etc/koschei/fedora-ca.cert",
},
{% endif %}
{% if env == 'staging' %} {% if env == 'staging' %}
"max_builds": 4, "max_builds": 4,
"build_arches": ['i386', 'x86_64', 'armhfp'], "build_arches": ['i386', 'x86_64', 'armhfp'],