diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-19 12:16:19 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-19 12:16:19 +0100 |
| commit | 497e38e0a25a1b9c2767cc0598fccb61ab042000 (patch) | |
| tree | bd691ddcc01216547091c41a2cffc0373885284f | |
| parent | bb9526ee271e532f1a3325b9c63cee200e8d9388 (diff) | |
Use legacy ZMS endpoint for tenancy provisioning
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java | 2 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/athenz.def | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java index 893dafa5885..806932385e1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java @@ -66,7 +66,7 @@ public class AthenzClientFactoryImpl implements AthenzClientFactory { Principal dualPrincipal = SimplePrincipal.create( AthenzIdentities.USER_PRINCIPAL_DOMAIN.getName(), signedToken.getName(), signedToken.getSignedToken(), athenzPrincipalAuthority); - return new ZmsClientImpl(new ZMSClient(config.zmsUrl(), dualPrincipal), config); + return new ZmsClientImpl(new ZMSClient(config.legacyZmsUrl(), dualPrincipal), config); } diff --git a/controller-server/src/main/resources/configdefinitions/athenz.def b/controller-server/src/main/resources/configdefinitions/athenz.def index 068b1d353ba..f8d65c25e47 100644 --- a/controller-server/src/main/resources/configdefinitions/athenz.def +++ b/controller-server/src/main/resources/configdefinitions/athenz.def @@ -3,10 +3,15 @@ namespace=vespa.hosted.controller.athenz.config # Principal header name principalHeaderName string default="Athenz-Principal-Auth" +# TODO Remove once migrated to Okta # URL to ZMS API endpoint zmsUrl string +# URL to legacy ZMS API endpoint +legacyZmsUrl string +# TODO Remove once migrated to Okta + # URL to ZTS API endpoint ztsUrl string |