diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-10-25 08:22:21 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-10-25 08:22:21 +0200 |
commit | 24cdc69fb571ac32f1f3f85258e7e9e596fa4e8f (patch) | |
tree | 7842db1a2a18fb297333b0e2094134a4a4e16dbe /configserver | |
parent | b0cf4fa2591530a85ed5dc88f94972a1598ac0d4 (diff) |
Docker image should not be considered when allocating nodes
* Ignore (wanted) docker image when allocating nodes, since this
is not an attribute of the node as it is used today, it might
change at any time (e.g. when upgrading Vespa)
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java index ec681bf0a70..2850241f493 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java @@ -36,7 +36,7 @@ public class StaticProvisioner implements HostProvisioner { if (requestedCluster.group().isPresent()) // we are requesting a specific group return nodeCluster.equals(requestedCluster); else // we are requesting nodes of all groups in this cluster - return nodeCluster.equalsIgnoringGroup(requestedCluster); + return nodeCluster.equalsIgnoringGroupAndDockerImage(requestedCluster); } } |