1 files changed, 9 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index af9eba92a98..7be4b27860c 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -19,6 +19,7 @@ import com.yahoo.document.DocumenttypesConfig;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig;
 import com.yahoo.messagebus.MessagebusConfig;
+import com.yahoo.vespa.config.content.core.AllClustersBucketSpacesConfig;
 import com.yahoo.vespa.configmodel.producers.DocumentManager;
 import com.yahoo.vespa.configmodel.producers.DocumentTypes;
 import com.yahoo.vespa.documentmodel.DocumentModel;
@@ -212,6 +213,14 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
     }
 
     @Override
+    public void getConfig(AllClustersBucketSpacesConfig.Builder builder) {
+        VespaModel model = (VespaModel) getRoot();
+        for (ContentCluster cluster : model.getContentClusters().values()) {
+            builder.cluster(cluster.getName(), cluster.clusterBucketSpaceConfigBuilder());
+        }
+    }
+
+    @Override
     public void getConfig(ModelConfig.Builder builder) {
         builder.vespaVersion(vespaVersion.toFullString());
         for (HostResource modelHost : getHostSystem().getHosts()) {