diff options
3 files changed, 7 insertions, 4 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java b/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java index 0e76db615a8..5ea2286c316 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java @@ -86,6 +86,10 @@ public class DockerImage { return Objects.hash(registry, repository, tag); } + public static DockerImage from(String registry, String repository) { + return new DockerImage(registry, repository, Optional.empty()); + } + public static DockerImage fromString(String s) { if (s.isEmpty()) return EMPTY; diff --git a/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def index 864c226147d..6409bbd1966 100644 --- a/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def +++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def @@ -1,9 +1,8 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=config.provisioning -# Docker image to use in REST API responses. This must be a fully qualified name, including registry, but excluding -# version. Example: my-docker-registry.domain.tld:8080/dist/vespa -dockerImage string default="dummyImage" +# Default container image to use for nodes. +containerImage string default="registry.example.com:9999/myorg/vespa" # Whether to cache data read from ZooKeeper in-memory. useCuratorClientCache bool default=false diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 54caddc9572..8ba226d2b30 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -130,7 +130,7 @@ public class NodeRepository extends AbstractComponent { Clock.systemUTC(), zone, new DnsNameResolver(), - DockerImage.fromString(config.dockerImage()), + DockerImage.fromString(config.containerImage()), flagSource, config.useCuratorClientCache(), provisionServiceProvider.getHostProvisioner().isPresent(), |