summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2020-08-24 13:39:54 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2020-08-24 13:39:54 +0200
commit481a11e8ba2aa877c6d82f220059ec69e33abdf1 (patch)
treeedc96840821c42d4a71e2d6e776191ce2ba13140 /node-repository
parentfa0b194c2ffcf266e06278fbf045a4e97c9b5f66 (diff)
Do not move non-tenant-hosts to deprovisioned
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java2
1 files changed, 1 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 ddf995bbe46..983ba5165e3 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
@@ -697,7 +697,7 @@ public class NodeRepository extends AbstractComponent {
children.forEach(child -> requireRemovable(child, true, force));
db.removeNodes(children);
List<Node> removed = new ArrayList<>(children);
- if (zone.getCloud().dynamicProvisioning())
+ if (zone.getCloud().dynamicProvisioning() || node.type() != NodeType.host)
db.removeNodes(List.of(node));
else {
node = node.with(IP.Config.EMPTY);