From 3304484fe9ea6ba79407a119752136ff05f41683 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Aug 2020 12:12:03 -0700 Subject: [PATCH] koji: hub/kojid: drop kerberos config options that got dropped upstream Upstream switched from python-requests-kerberos to python-requests-gssapi and dropped some options. Unfortunately, these cause kojid / kojira to not even start if they are present, so we have to remove them to make things happy. Signed-off-by: Kevin Fenzi --- roles/koji_builder/templates/kojid.conf | 2 -- roles/koji_hub/templates/kojira.conf.j2 | 1 - 2 files changed, 3 deletions(-) diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 1a7dcfa7c7..304e498d9c 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -140,8 +140,6 @@ serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ; Kerberos configuration krb_principal = compile/{{ inventory_hostname }}@{{ ipa_realm }} keytab = /etc/kojid/kojid.keytab -krbservice = host -krb_rdns = false {% set plugins = [] %} diff --git a/roles/koji_hub/templates/kojira.conf.j2 b/roles/koji_hub/templates/kojira.conf.j2 index fe07d7fe9f..741755e132 100644 --- a/roles/koji_hub/templates/kojira.conf.j2 +++ b/roles/koji_hub/templates/kojira.conf.j2 @@ -33,7 +33,6 @@ max_repo_tasks=30 repo_tasks_limit=40 ; Server certificate authority -krb_rdns=false serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ;how soon (in seconds) to clean up expired repositories. 1 week default