diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-10-20 14:03:03 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-10-20 15:56:36 +0200 |
| commit | 377e53ef66deb711604e5ce8281b86a57bc85229 (patch) | |
| tree | bd15f334cc78ba0631940cc55e0513f39c190da2 /config-provisioning | |
| parent | 48fecb4ccef19027713c5d04d02bc91ffb136ca4 (diff) | |
Rename config field
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java | 4 | ||||
| -rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def | 5 |
2 files changed, 6 insertions, 3 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 |