summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-01-03 17:21:31 +0100
committerHarald Musum <musum@oath.com>2018-01-03 17:21:31 +0100
commit678a5f96e0d8e9c9024d78513a3e48f78fd6ef59 (patch)
treef7348f9e3cc099f197d1d3348e102e7906f21f66 /controller-server
parentded1d3f4e61278c47209efd9b1b1bdb984439651 (diff)
Fix bug when creating zone id
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
index 937c93a2f5c..7d06bbde081 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
@@ -250,7 +250,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor {
new AthenzIdentityVerifier(
singleton(
zoneRegistry.getConfigserverAthenzService(
- ZoneId.from(proxyRequest.getEnvironment(), proxyRequest.getEnvironment()))));
+ ZoneId.from(proxyRequest.getEnvironment(), proxyRequest.getRegion()))));
return HttpClientBuilder.create()
.setUserAgent("config-server-client")
.setSslcontext(sslContextProvider.get())