From d6050d78ac5bca35b1f857bd3fd34fc0a46858cf Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahoo-inc.com>
Date: Mon, 5 Dec 2016 13:07:17 +0100
Subject: Allow configuring docker registry and Docker Vespa base image

---
 .../vespa/model/container/configserver/ConfigserverCluster.java     | 6 ++++++
 .../model/container/configserver/option/CloudConfigOptions.java     | 2 ++
 .../com/yahoo/vespa/model/container/configserver/TestOptions.java   | 6 ++++++
 3 files changed, 14 insertions(+)

(limited to 'config-model')

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;
-- 
cgit v1.2.3