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

Prefix ODCS KRB_* options with KOJI_ to match new odcs version.

Browse source
This commit is contained in:
Jan Kaluža 2018-01-18 07:58:38 +00:00
parent 6ecba72fc7
commit 4239068ed6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/odcs/base/templates/etc/odcs/config.py.j2
View file

@ -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 }}"