1 files changed, 16 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 27da41c2bfa..1ec56fe529a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -12,6 +12,7 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.content.MessagetyperouteselectorpolicyConfig;
 import com.yahoo.vespa.config.content.FleetcontrollerConfig;
 import com.yahoo.vespa.config.content.StorDistributionConfig;
+import com.yahoo.vespa.config.content.AllClustersBucketSpacesConfig;
 import com.yahoo.vespa.config.content.core.BucketspacesConfig;
 import com.yahoo.vespa.config.content.core.StorDistributormanagerConfig;
 import com.yahoo.documentmodel.NewDocumentType;
@@ -736,13 +737,26 @@ public class ContentCluster extends AbstractConfigProducer implements
     private static final String DEFAULT_BUCKET_SPACE = "default";
     private static final String GLOBAL_BUCKET_SPACE = "global";
 
+    private String bucketSpaceOfDocumentType(NewDocumentType docType) {
+        return (isGloballyDistributed(docType) ? GLOBAL_BUCKET_SPACE : DEFAULT_BUCKET_SPACE);
+    }
+
+    public AllClustersBucketSpacesConfig.Cluster.Builder clusterBucketSpaceConfigBuilder() {
+        AllClustersBucketSpacesConfig.Cluster.Builder builder = new AllClustersBucketSpacesConfig.Cluster.Builder();
+        for (NewDocumentType docType : getDocumentDefinitions().values()) {
+            AllClustersBucketSpacesConfig.Cluster.DocumentType.Builder typeBuilder = new AllClustersBucketSpacesConfig.Cluster.DocumentType.Builder();
+            typeBuilder.bucketSpace(bucketSpaceOfDocumentType(docType));
+            builder.documentType(docType.getName(), typeBuilder);
+        }
+        return builder;
+    }
+
     @Override
     public void getConfig(BucketspacesConfig.Builder builder) {
         for (NewDocumentType docType : getDocumentDefinitions().values()) {
             BucketspacesConfig.Documenttype.Builder docTypeBuilder = new BucketspacesConfig.Documenttype.Builder();
             docTypeBuilder.name(docType.getName());
-            String bucketSpace = (isGloballyDistributed(docType) ? GLOBAL_BUCKET_SPACE : DEFAULT_BUCKET_SPACE);
-            docTypeBuilder.bucketspace(bucketSpace);
+            docTypeBuilder.bucketspace(bucketSpaceOfDocumentType(docType));
             builder.documenttype(docTypeBuilder);
         }
     }