diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-05-08 11:11:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-08 11:11:04 +0200 |
commit | 30983e028f268ace5403be2838007d8e1ae97f9e (patch) | |
tree | 6755650548397f41cf77c8b159d3ab731d65613e /node-repository | |
parent | e25ab7b45c471593cc97a2aa7107b048881cfee1 (diff) |
Revert "Unset cloud account in GCP"
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index b77fa717743..478d49d67d4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -5,8 +5,6 @@ import com.yahoo.collections.ListMap; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationTransaction; -import com.yahoo.config.provision.CloudAccount; -import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeType; @@ -83,10 +81,8 @@ public class Nodes { Instant start = clock.instant(); int nodesWritten = performOn(list(), (node, mutex) -> { // TODO (valerijf): Remove after 8.162 -// if (node.cloudAccount().isUnspecified() && !zone.getCloud().account().isUnspecified()) -// node = node.with(zone.getCloud().account()); - if (zone.getCloud().name().equals(CloudName.GCP)) - node.with(CloudAccount.empty); + if (node.cloudAccount().isUnspecified() && !zone.getCloud().account().isUnspecified()) + node = node.with(zone.getCloud().account()); return write(node, mutex); }).size(); Instant end = clock.instant(); |