Use new delete application code in two main zones

Add config switch for delete application to make it possible to
turn it off without code changes

1 files changed, 5 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 1bfe14566f7..552a67c902e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -270,10 +270,12 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
      */
     public boolean delete(ApplicationId applicationId) {
         // TODO: Use deleteApplication() in all zones
-        if ( ! configserverConfig.hostedVespa() || SystemName.from(configserverConfig.system()) == SystemName.cd) {
-            return deleteApplication(applicationId);
-        } else {
+        if (configserverConfig.deleteApplicationLegacy() ||
+                (configserverConfig.hostedVespa() && SystemName.from(configserverConfig.system()) == SystemName.main
+                        && !Arrays.asList("corp-us-east-1", "aws-us-east-1a").contains(configserverConfig.region()))) {
             return deleteApplicationLegacy(applicationId);
+        } else {
+            return deleteApplication(applicationId);
         }
     }