1 files changed, 12 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 071b3090f99..eaa4f18e35a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -48,6 +48,11 @@ public class Admin extends AbstractConfigProducer implements Serializable {
     private final List<Slobrok> slobroks = new ArrayList<>();
     private Configserver defaultConfigserver;
     private Logserver logserver;
+    private LogForwarder.Config logForwarderConfig = null;
+
+    public void setLogForwarderConfig(LogForwarder.Config cfg) {
+        this.logForwarderConfig = cfg;
+    }
 
     /**
      * The single cluster controller cluster shared by all content clusters by default when not multitenant.
@@ -186,6 +191,9 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         addLogd(host);
         addConfigProxy(host);
         addFileDistribution(host);
+        if (logForwarderConfig != null) {
+            addLogForwarder(host);
+        }
     }
 
     private void addConfigSentinel(HostResource host, ApplicationId applicationId, Zone zone) {
@@ -194,6 +202,10 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         host.getHost().setConfigSentinel(configSentinel);
     }
 
+    private void addLogForwarder(HostResource host) {
+        addAndInitializeService(host, new LogForwarder(host.getHost(), logForwarderConfig));
+    }
+
     private void addLogd(HostResource host) {
         addAndInitializeService(host, new Logd(host.getHost()));
     }