Merge pull request #7204 from vespa-engine/revert-7182-revert-7177-revert-7154-hmusum/use-dedicated-logserver-nodes-in-more-zones

Revert "Revert "Revert "Enable dedicated log server nodes in all dev and perf zones and one p…"""

1 files changed, 4 insertions, 5 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 26de67d4722..16dd1970ed1 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
@@ -7,7 +7,7 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
-import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.HostSystem;
@@ -21,7 +21,6 @@ import com.yahoo.vespa.model.container.component.Handler;
 import org.w3c.dom.Element;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -95,13 +94,13 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
     }
 
     private NodesSpecification createNodesSpecificationForLogserver() {
-        // TODO: Enable for all zones
+        // TODO: Enable for main system as well
         DeployState deployState = context.getDeployState();
         if (deployState.getProperties().useDedicatedNodeForLogserver() &&
                 context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT &&
                 deployState.isHosted() &&
-                (Arrays.asList(Environment.dev, Environment.perf).contains(deployState.zone().environment()) ||
-                        deployState.zone().region().equals(RegionName.from("eu-west-1"))))
+                deployState.zone().system() == SystemName.cd &&
+                deployState.zone().environment() == Environment.dev)
             return NodesSpecification.dedicated(1, context);
         else
             return NodesSpecification.nonDedicated(1, context);