From 54fdfd9f4a099584d03a385203c89cc1e16e0c2d Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Tue, 4 Apr 2023 13:02:11 +0200 Subject: Use config server domain --- .../java/com/yahoo/vespa/model/container/IdentityProvider.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config-model/src/main/java') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/IdentityProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/IdentityProvider.java index 5e8bb85c29d..2b5dadf5512 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/IdentityProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/IdentityProvider.java @@ -51,15 +51,18 @@ public class IdentityProvider extends SimpleComponent implements IdentityConfig. builder.loadBalancerAddress(loadBalancerName.value()); builder.ztsUrl(ztsUrl != null ? ztsUrl.toString() : ""); builder.athenzDnsSuffix(athenzDnsSuffix != null ? athenzDnsSuffix : ""); - builder.nodeIdentityName("vespa.vespa.tenant"); // TODO Move to Oath configmodel amender + builder.nodeIdentityName(configServerDomain() + ".tenant"); // TODO Move to Oath configmodel amender builder.configserverIdentityName(getConfigserverIdentityName()); } // TODO Move to Oath configmodel amender private String getConfigserverIdentityName() { return String.format("%s.provider_%s_%s", - zone.system() == SystemName.main ? "vespa.vespa" : "vespa.vespa.cd", + configServerDomain(), zone.environment().value(), zone.region().value()); } + private String configServerDomain() { + return zone.system() == SystemName.main ? "vespa.vespa" : "vespa.vespa.cd"; + } } -- cgit v1.2.3