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

FASJSON: fix krb5.conf

Browse source 
Simo deserves vast amounts of cookies on this one.

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2020-09-02 23:08:17 +02:00
parent 0835ec7850
commit 435938d298
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
roles/openshift-apps/fasjson/templates/buildconfig.yml
View file

@ -19,6 +19,7 @@ spec:
kind: ImageStreamTag kind: ImageStreamTag
name: fasjson:latest name: fasjson:latest
triggers: triggers:
- type: ConfigChange
- type: ImageChange - type: ImageChange
- type: GitHub - type: GitHub
{% if fasjson_stg_github_secret is defined and env == 'staging' %} {% if fasjson_stg_github_secret is defined and env == 'staging' %}

7
roles/openshift-apps/fasjson/templates/krb5.conf
View file

@ -23,7 +23,8 @@ includedir /etc/krb5.conf.d/
} }
[domain_realm] [domain_realm]
{{ env_suffix }}.fedoraproject.org = {{ ipa_realm }} {{ env_short }}.fedoraproject.org = {{ ipa_realm }}
{{ ipa_realm | lower }} = {{ ipa_realm }} .{{ env_short }}.fedoraproject.org = {{ ipa_realm }}
{{ inventory_hostname }} = {{ ipa_realm }} {{ env_short }}.{{ datacenter }}.fedoraproject.org = {{ ipa_realm }}
.{{ env_short }}.{{ datacenter }}.fedoraproject.org = {{ ipa_realm }}
fasjson{{ env_suffix }}.fedoraproject.org = {{ ipa_realm }} fasjson{{ env_suffix }}.fedoraproject.org = {{ ipa_realm }}

1
roles/openshift-apps/noggin/templates/buildconfig.yml
View file

@ -29,6 +29,7 @@ spec:
kind: ImageStreamTag kind: ImageStreamTag
name: noggin:latest name: noggin:latest
triggers: triggers:
- type: ConfigChange
- type: ImageChange - type: ImageChange
- type: GitHub - type: GitHub
{% if noggin_stg_github_secret is defined and env == 'staging' %} {% if noggin_stg_github_secret is defined and env == 'staging' %}