Merge pull request #6320 from vespa-engine/hmusum/use-new-delete-application-code-in-CD

Use new code for deleting applications in CD too

1 files changed, 5 insertions, 4 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 1b7ac55ee63..1bfe14566f7 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
@@ -15,6 +15,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostFilter;
 import com.yahoo.config.provision.Provisioner;
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.io.IOUtils;
@@ -268,11 +269,11 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
      * @throws RuntimeException if the delete transaction fails. This method is exception safe.
      */
     public boolean delete(ApplicationId applicationId) {
-        // TODO: Use deleteApplication() in all zones, for now use it only in non-hosted
-        if (configserverConfig.hostedVespa()) {
-            return deleteApplicationLegacy(applicationId);
-        } else {
+        // TODO: Use deleteApplication() in all zones
+        if ( ! configserverConfig.hostedVespa() || SystemName.from(configserverConfig.system()) == SystemName.cd) {
             return deleteApplication(applicationId);
+        } else {
+            return deleteApplicationLegacy(applicationId);
         }
     }