From 4239068ed694078630710c20a4f938a2c8325ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= Date: Thu, 18 Jan 2018 07:58:38 +0000 Subject: [PATCH] Prefix ODCS KRB_* options with KOJI_ to match new odcs version. --- roles/odcs/base/templates/etc/odcs/config.py.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/odcs/base/templates/etc/odcs/config.py.j2 b/roles/odcs/base/templates/etc/odcs/config.py.j2 index 51ce7fd0fd..55de32e3d8 100644 --- a/roles/odcs/base/templates/etc/odcs/config.py.j2 +++ b/roles/odcs/base/templates/etc/odcs/config.py.j2 @@ -76,7 +76,7 @@ class ProdConfiguration(BaseConfiguration): PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1' - KRB_PRINCIPAL = 'odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG' + KOJI_KRB_PRINCIPAL = 'odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG' {% else %} AUTH_OPENIDC_USERINFO_URI = 'https://id.fedoraproject.org/openidc/UserInfo' @@ -88,13 +88,13 @@ class ProdConfiguration(BaseConfiguration): PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1' - KRB_PRINCIPAL = 'odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG' + KOJI_KRB_PRINCIPAL = 'odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG' {% endif %} PDC_INSECURE = {{ odcs_pdc_insecure }} PDC_DEVELOP = {{ odcs_pdc_develop }} - KRB_KEYTAB = '/etc/krb5.odcs_odcs{{env_suffix}}.fedoraproject.org.keytab' - KRB_CCACHE = None + KOJI_KRB_KEYTAB = '/etc/krb5.odcs_odcs{{env_suffix}}.fedoraproject.org.keytab' + KOJI_KRB_CCACHE = None TARGET_DIR = "{{ odcs_target_dir }}" TARGET_DIR_URL = "{{ odcs_target_dir_url }}"