diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2016-12-05 13:07:17 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahoo-inc.com> | 2016-12-05 13:07:17 +0100 |
| commit | d6050d78ac5bca35b1f857bd3fd34fc0a46858cf (patch) | |
| tree | b0c02bc1d8a959272436409cf527e213840b4d55 /config-model | |
| parent | a767ce95b82eb3674258717a5edc6e54816eb4cf (diff) | |
Allow configuring docker registry and Docker Vespa base image
Diffstat (limited to 'config-model')
3 files changed, 14 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java index 156b8c980de..ef698c1f196 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java @@ -135,6 +135,12 @@ public class ConfigserverCluster extends AbstractConfigProducer if (options.numParallelTenantLoaders().isPresent()) { builder.numParallelTenantLoaders(options.numParallelTenantLoaders().get()); } + if (options.dockerRegistry().isPresent()) { + builder.dockerRegistry(options.dockerRegistry().get()); + } + if (options.dockerVespaBaseImage().isPresent()) { + builder.dockerVespaBaseImage(options.dockerVespaBaseImage().get()); + } } private String[] getConfigModelPluginDirs() { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java index 57c4691f523..f895d063884 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java @@ -41,4 +41,6 @@ public interface CloudConfigOptions { Optional<String> defaultContentFlavor(); Optional<Boolean> useVespaVersionInRequest(); Optional<Integer> numParallelTenantLoaders(); + Optional<String> dockerRegistry(); + Optional<String> dockerVespaBaseImage(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java index 31651c5166b..0ba46005040 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java @@ -109,6 +109,12 @@ public class TestOptions implements CloudConfigOptions { @Override public Optional<Integer> numParallelTenantLoaders() { return numParallelTenantLoaders; } + @Override + public Optional<String> dockerRegistry() { return Optional.empty(); } + + @Override + public Optional<String> dockerVespaBaseImage() { return Optional.empty(); } + public TestOptions numParallelTenantLoaders(int numLoaders) { this.numParallelTenantLoaders = Optional.of(numLoaders); return this; |