More wiring for making it possible to disable filedistributor

2 files changed, 22 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 74512e70ebe..7a1fab8dbd0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -138,7 +138,8 @@ public class VespaModelFactory implements ModelFactory {
             .rotations(modelContext.properties().rotations())
             .zone(zone)
             .now(clock.instant())
-            .wantedNodeVespaVersion(modelContext.wantedNodeVespaVersion());
+            .wantedNodeVespaVersion(modelContext.wantedNodeVespaVersion())
+            .disableFiledistributor(modelContext.properties().disableFileDistributor());
         modelContext.previousModel().ifPresent(builder::previousModel);
         return builder.build();
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index 946624a1cdb..d8bf40ac2d8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -307,4 +307,24 @@ public class AdminTestCase {
         assertThat(sentinelConfig.service(2).name(), is("logd"));
         // No filedistributor service
     }
+
+    @Test
+    public void testDisableFileDistributorForAllApps() {
+        DeployState state = new DeployState.Builder()
+                .disableFiledistributor(true)
+                .properties(
+                        new DeployProperties.Builder().
+                                zone(new Zone(Environment.dev, RegionName.from("baz"))).
+                                applicationId(new ApplicationId.Builder().
+                                        tenant("quux").
+                                        applicationName("foo").instanceName("bim").build()).build()).build();
+        TestRoot root = new TestDriver().buildModel(state);
+        String localhost = HostName.getLocalhost();
+        SentinelConfig sentinelConfig = root.getConfig(SentinelConfig.class, "hosts/" + localhost);
+        assertThat(sentinelConfig.service().size(), is(3));
+        assertThat(sentinelConfig.service(0).name(), is("logserver"));
+        assertThat(sentinelConfig.service(1).name(), is("slobrok"));
+        assertThat(sentinelConfig.service(2).name(), is("logd"));
+    }
+
 }