Fix exclave condition

1 files changed, 6 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index 6cdb197b307..f2cd55b88b2 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -39,8 +39,12 @@ public interface ZoneRegistry {
     /** Returns whether cloudAccount in this system supports given zone */
     boolean hasZone(ZoneId zoneId, CloudAccount cloudAccount);
 
-    /** Returns whether the given cloud account is an enclave */
-    boolean isEnclave(CloudAccount cloudAccount);
+    /** Returns whether the given cloud account is not one of the system accounts */
+    boolean isExternal(CloudAccount cloudAccount);
+
+    default boolean isExclave(CloudAccount cloudAccount) {
+        return system().isPublic() && isExternal(cloudAccount);
+    }
 
     /** Returns a list containing the id of all zones in this registry */
     ZoneFilter zones();