diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-04-23 09:07:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 09:07:00 +0200 |
| commit | c20789e307457b8c0eeef4587604a45cea5672b1 (patch) | |
| tree | 3b0ded482f5d092cd7461f90b898880d3fe4acb9 | |
| parent | 55715af3c25fb31eb0bdf9a4d33ff6a9573ef6f1 (diff) | |
| parent | 574fb026f859e8f5a22e80a145fb3f002bfba6dc (diff) | |
Merge pull request #5666 from vespa-engine/hmusum/skip-cd-aws-zone-when-checking-version
Skip new CD AWS zone as well
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index 6e7e68a2dc9..dcc386b2b80 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -126,7 +126,10 @@ public class VersionStatus { List<URI> configServers = controller.zoneRegistry().zones() .controllerManaged() // TODO jvenstad: Remove this when AWS is automatically upgraded. - .not().among(ZoneId.from("prod.cd-us-east-1a"), ZoneId.from("prod.aws-us-east-1a"), ZoneId.from("dev.aws-us-east-2a")) + .not().among(ZoneId.from("prod.cd-us-east-1a"), + ZoneId.from("prod.cd-aws-us-east-1a"), + ZoneId.from("prod.aws-us-east-1a"), + ZoneId.from("dev.aws-us-east-2a")) .ids().stream() .flatMap(zoneId -> controller.zoneRegistry().getConfigServerUris(zoneId).stream()) .collect(Collectors.toList()); |