Remove hosts on aws

1 files changed, 4 insertions, 1 deletions

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 9f2bf81b475..5174d1c16d9 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
@@ -608,8 +608,11 @@ public class NodeRepository extends AbstractComponent {
                 List<Node> children = list().childrenOf(node).asList();
                 children.forEach(child -> requireRemovable(child, true, force));
                 db.removeNodes(children);
-                move(node, State.deprovisioned, Agent.system, Optional.empty());
                 List<Node> removed = new ArrayList<>(children);
+                if (zone.cloud().value().equals("aws"))
+                    db.removeNodes(List.of(node));
+                else
+                    move(node, State.deprovisioned, Agent.system, Optional.empty());
                 removed.add(node);
                 return removed;
             }