diff options
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 6 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/identity.def | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index b7482a3646d..44b49a8f842 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -13,6 +13,7 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.docproc.DocprocConfig; import com.yahoo.config.docproc.SchemamappingConfig; import com.yahoo.config.model.ApplicationConfigProducerRoot; +import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.provision.Rotation; @@ -872,6 +873,11 @@ public final class ContainerCluster @Override public void getConfig(IdentityConfig.Builder builder) { if (identity != null) { + // TODO: Inject the load balancer address. For now only add first configserver + String cfgHostName = getRoot().getDeployState().getProperties() + .configServerSpecs().stream().findFirst().map(ConfigServerSpec::getHostName) + .orElse(""); // How to test this? + builder.loadBalancerAddress(cfgHostName); identity.getConfig(builder); } } diff --git a/container-core/src/main/resources/configdefinitions/identity.def b/container-core/src/main/resources/configdefinitions/identity.def index 8c0a9b3c354..82cd2c4904c 100644 --- a/container-core/src/main/resources/configdefinitions/identity.def +++ b/container-core/src/main/resources/configdefinitions/identity.def @@ -2,3 +2,4 @@ namespace=container.core.identity domain string service string +loadBalancerAddress string
\ No newline at end of file |