diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-11-17 10:58:50 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-11-17 10:58:50 +0100 |
commit | c189a6cf1629438f01297815b8c8073ca0185ce4 (patch) | |
tree | 23623e5a546b6517da9ca3fd7906fa0ea963c154 /config-model-api | |
parent | 0181f8096639237153f466d1f1b5993c52f701c8 (diff) | |
parent | 359d3c4a6d22a0ea4aef20e7293fe808228d4b6f (diff) |
Resolved conflict
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index eef90975035..521e72ae580 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -6,6 +6,7 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; @@ -42,10 +43,18 @@ public interface ModelContext { boolean multitenant(); ApplicationId applicationId(); List<ConfigServerSpec> configServerSpecs(); - URI loadBalancerAddress(); + HostName loadBalancerName(); boolean hostedVespa(); Zone zone(); Set<Rotation> rotations(); + + /* + * DEPRECATED + * TODO: Remove when 6.172 and earlier are no longer in use + */ + default URI loadBalancerAddress() { + return URI.create("http://localhost"); + } } } |