diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2021-09-08 16:22:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 16:22:42 +0200 |
| commit | 0abc3b837664e1c82eb61e50d20efbafc31eb9df (patch) | |
| tree | 9148f3c59e5d37be32b3ba7df30a8a3397c9cdb9 /controller-server | |
| parent | c36ef71581dc3e75fb393944f1395eacbc53a780 (diff) | |
Revert "Enable S3 archive bucket for CD"
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java index 52c192cfeab..0f5c2123325 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java @@ -1,7 +1,6 @@ // Copyright 2021 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.archive; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.text.Text; @@ -46,8 +45,7 @@ public class CuratorArchiveBucketDb { public CuratorArchiveBucketDb(Controller controller) { this.archiveService = controller.serviceRegistry().archiveService(); this.curatorDb = controller.curator(); - SystemName system = controller.zoneRegistry().system(); - this.enabled = system.isPublic() || system.isCd(); + this.enabled = controller.zoneRegistry().system().isPublic(); } public Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant) { |