From 435938d298729f2dfd45e07fcc5ab4cf9acf3d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 2 Sep 2020 23:08:17 +0200 Subject: [PATCH] FASJSON: fix krb5.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simo deserves vast amounts of cookies on this one. Signed-off-by: Aurélien Bompard --- roles/openshift-apps/fasjson/templates/buildconfig.yml | 1 + roles/openshift-apps/fasjson/templates/krb5.conf | 7 ++++--- roles/openshift-apps/noggin/templates/buildconfig.yml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/openshift-apps/fasjson/templates/buildconfig.yml b/roles/openshift-apps/fasjson/templates/buildconfig.yml index fa2fc4e9da..301a8b2313 100644 --- a/roles/openshift-apps/fasjson/templates/buildconfig.yml +++ b/roles/openshift-apps/fasjson/templates/buildconfig.yml @@ -19,6 +19,7 @@ spec: kind: ImageStreamTag name: fasjson:latest triggers: + - type: ConfigChange - type: ImageChange - type: GitHub {% if fasjson_stg_github_secret is defined and env == 'staging' %} diff --git a/roles/openshift-apps/fasjson/templates/krb5.conf b/roles/openshift-apps/fasjson/templates/krb5.conf index fc1d24dcdc..110aa822f6 100644 --- a/roles/openshift-apps/fasjson/templates/krb5.conf +++ b/roles/openshift-apps/fasjson/templates/krb5.conf @@ -23,7 +23,8 @@ includedir /etc/krb5.conf.d/ } [domain_realm] - {{ env_suffix }}.fedoraproject.org = {{ ipa_realm }} - {{ ipa_realm | lower }} = {{ ipa_realm }} - {{ inventory_hostname }} = {{ ipa_realm }} + {{ env_short }}.fedoraproject.org = {{ ipa_realm }} + .{{ env_short }}.fedoraproject.org = {{ ipa_realm }} + {{ env_short }}.{{ datacenter }}.fedoraproject.org = {{ ipa_realm }} + .{{ env_short }}.{{ datacenter }}.fedoraproject.org = {{ ipa_realm }} fasjson{{ env_suffix }}.fedoraproject.org = {{ ipa_realm }} diff --git a/roles/openshift-apps/noggin/templates/buildconfig.yml b/roles/openshift-apps/noggin/templates/buildconfig.yml index 1ca1710cfa..b87d7ba929 100644 --- a/roles/openshift-apps/noggin/templates/buildconfig.yml +++ b/roles/openshift-apps/noggin/templates/buildconfig.yml @@ -29,6 +29,7 @@ spec: kind: ImageStreamTag name: noggin:latest triggers: + - type: ConfigChange - type: ImageChange - type: GitHub {% if noggin_stg_github_secret is defined and env == 'staging' %}