1 files changed, 2 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 28cea9843c7..2c23043abea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -10,9 +10,6 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.flags.FetchVector;
-import com.yahoo.vespa.flags.FlagSource;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.HostSystem;
 import com.yahoo.vespa.model.admin.Admin;
@@ -103,7 +100,8 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
         if (deployState.getProperties().useDedicatedNodeForLogserver() &&
                 context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT &&
                 deployState.isHosted() &&
-                logServerFlagValue(deployState))
+                deployState.zone().system() == SystemName.cd &&
+                deployState.zone().environment() == Environment.dev)
             return NodesSpecification.dedicated(1, context);
         else
             return NodesSpecification.nonDedicated(1, context);
@@ -225,10 +223,4 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
         admin.addSlobroks(slobroks);
     }
 
-    private boolean logServerFlagValue(DeployState deployState) {
-        return Flags.ENABLE_LOGSERVER.bindTo(deployState.flagSource())
-                .with(FetchVector.Dimension.APPLICATION_ID, deployState.getProperties().applicationId().serializedForm())
-                .value();
-    }
-
 }