Throw if bootstrapping tenant repo fails in all zones

1 files changed, 1 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index a5e4cfede0e..bd5b694d657 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -6,7 +6,6 @@ import com.google.inject.Inject;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.concurrent.ThreadFactoryFactory;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.log.LogLevel;
 import com.yahoo.path.Path;
@@ -182,7 +181,7 @@ public class TenantRepository implements ConnectionStateListener, PathChildrenCa
             }
         }
 
-        if (failed.size() > 0 && throwExceptionIfBootstrappingFails && globalComponentRegistry.getZone().system() == SystemName.cd)
+        if (failed.size() > 0 && throwExceptionIfBootstrappingFails)
             throw new RuntimeException("Could not create all tenants when bootstrapping, failed to create: " + failed);
 
         metricUpdater.setTenants(tenants.size());