From 441d4b4dec7bf7d1e67fa37faee624fad2ad5fdf Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 28 May 2019 12:23:15 +0200 Subject: Add isCd method to SystemName --- .../com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'node-admin') diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 3fbe5b209ec..a200ff9a805 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.nodeagent; import com.fasterxml.jackson.core.JsonProcessingException; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.log.LogLevel; import com.yahoo.vespa.flags.DoubleFlag; @@ -376,8 +375,7 @@ public class NodeAgentImpl implements NodeAgent { private boolean noCpuCap(ZoneId zoneId) { return zoneId.environment() == Environment.dev - // TODO: Add other cd systems, not ideal when having just SystemName here - || (zoneId.system() == SystemName.cd && zoneId.environment() != Environment.prod); + || (zoneId.system().isCd() && zoneId.environment() != Environment.prod); } private void scheduleDownLoadIfNeeded(NodeSpec node, Optional container) { -- cgit v1.2.3