Revert "Balder/single searchcluster"

1 files changed, 5 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index c98e2dac1d9..035ae4a06f5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -22,6 +22,7 @@ import com.yahoo.vespa.model.container.component.ContainerSubsystem;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 import com.yahoo.vespa.model.search.IndexedSearchCluster;
 import com.yahoo.vespa.model.search.SearchCluster;
+import com.yahoo.vespa.model.search.StreamingSearchCluster;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -178,7 +179,10 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
             }
             scB.rankprofiles_configid(sys.getConfigId());
             scB.indexingmode(QrSearchersConfig.Searchcluster.Indexingmode.Enum.valueOf(sys.getIndexingModeName()));
-            scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder().routespec(sys.getStorageRouteSpec()));
+            if ( ! (sys instanceof IndexedSearchCluster)) {
+                scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder().
+                                           routespec(((StreamingSearchCluster)sys).getStorageRouteSpec()));
+            }
             builder.searchcluster(scB);
         }
     }