From f834a8443ccd6d4d8d5e668db4b3d577ffebd17f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 28 Jul 2022 15:53:57 -0700 Subject: [PATCH] kojibuilder: drop trying to add identity in prod as it is already included with api Signed-off-by: Kevin Fenzi --- roles/koji_builder/templates/osbuildapi-update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/koji_builder/templates/osbuildapi-update.sh b/roles/koji_builder/templates/osbuildapi-update.sh index ff46b8ae37..bfebde5189 100644 --- a/roles/koji_builder/templates/osbuildapi-update.sh +++ b/roles/koji_builder/templates/osbuildapi-update.sh @@ -19,7 +19,9 @@ do /usr/sbin/ipset add osbuildapi $j done -# in both stg and prod apparently we use idenity.adpi.openshift.com for auth +{% if env == 'staging' %} +# in stg we need to add identity.api because we are using api.stage above. +# in prod this is already the same as api.openshift.com, so skip it. RESOLVEQUERY=`resolvectl --cache=no --legend=no query identity.api.openshift.com 2> /dev/null` test $? -eq 0 || exit $? @@ -29,3 +31,4 @@ for j in $NEWIDENTITYIPS do /usr/sbin/ipset add osbuildapi $j done +{% endif %}