summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2019-10-31 09:01:10 +0100
committerMorten Tokle <mortent@verizonmedia.com>2019-10-31 09:01:10 +0100
commit96c613dd8c4adb86b4af781ae4b905bb748540be (patch)
treeb91bd57361426fb51376c6bc0a44cfb5f8852822
parente94792f9392c9648011f2f9c8ddec49262c8c76c (diff)
Add tenantService config
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java2
-rw-r--r--configdefinitions/src/vespa/athenz-provider-service.def3
2 files changed, 4 insertions, 1 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
index a417fc17f3a..89e7e340641 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
@@ -54,7 +54,7 @@ public class InstanceValidator {
SuperModelProvider superModelProvider,
NodeRepository nodeRepository,
AthenzProviderServiceConfig config) {
- this(keyProvider, superModelProvider, nodeRepository, new IdentityDocumentSigner(), new AthenzService(config.domain(), "tenant"));
+ this(keyProvider, superModelProvider, nodeRepository, new IdentityDocumentSigner(), new AthenzService(config.tenantService()));
}
public InstanceValidator(KeyProvider keyProvider,
diff --git a/configdefinitions/src/vespa/athenz-provider-service.def b/configdefinitions/src/vespa/athenz-provider-service.def
index 7a06b13d435..bd929cb17d4 100644
--- a/configdefinitions/src/vespa/athenz-provider-service.def
+++ b/configdefinitions/src/vespa/athenz-provider-service.def
@@ -24,3 +24,6 @@ athenzCaTrustStore string
# Period between certificate updates
updatePeriodDays int default=1
+
+# Tenant Service id
+tenantService string default=vespa.vespa.tenant \ No newline at end of file