Unset cloud account in GCP

1 files changed, 6 insertions, 2 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 478d49d67d4..b77fa717743 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,6 +5,8 @@ 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;
@@ -81,8 +83,10 @@ 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 (node.cloudAccount().isUnspecified() && !zone.getCloud().account().isUnspecified())
+//                node = node.with(zone.getCloud().account());
+            if (zone.getCloud().name().equals(CloudName.GCP))
+                node.with(CloudAccount.empty);
             return write(node, mutex);
         }).size();
         Instant end = clock.instant();