diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-16 16:23:01 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-16 16:37:10 +0100 |
commit | d95ea7404aca7575009c56668eb519bc0db6a8b6 (patch) | |
tree | 9f9892a107f33d04a3f650a7a3cea6e531a5e3f4 /config-model | |
parent | b60764ffb0573f1915dc83d17a105bc19779d88a (diff) |
Don't add port 4443 to tester applications
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index e2aa5f1316f..3da0b01f614 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -189,7 +189,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.addDefaultHandlersExceptStatus(); addStatusHandlers(cluster, context.getDeployState().isHosted()); - addHttp(deployState, spec, cluster, context.getApplicationType()); + addHttp(deployState, spec, cluster, context.getApplicationType(), deployState.getProperties().applicationId().instance().isTester()); addAccessLogs(deployState, cluster, spec); addRoutingAliases(cluster, spec, deployState.zone().environment()); @@ -311,12 +311,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } - private void addHttp(DeployState deployState, Element spec, ApplicationContainerCluster cluster, ApplicationType applicationType) { + private void addHttp(DeployState deployState, Element spec, ApplicationContainerCluster cluster, ApplicationType applicationType, boolean isTesterApplication) { Element httpElement = XML.getChild(spec, "http"); if (httpElement != null) { cluster.setHttp(buildHttp(deployState, cluster, httpElement)); } - if (deployState.isHosted() && applicationType == ApplicationType.DEFAULT) { + if (deployState.isHosted() && applicationType == ApplicationType.DEFAULT && !isTesterApplication) { addAdditionalHostedConnector(deployState, cluster); } } |