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)

1 files changed, 12 insertions, 0 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 35666832929..6a397d0e17a 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -70,7 +70,19 @@ public final class ClusterSpec {
         return true;
     }
 
+    /** Returns whether this is equal, disregarding the group value and wanted docker image */
+    public boolean equalsIgnoringGroupAndDockerImage(Object o) {
+        if (o == this) return true;
+        if ( ! (o instanceof ClusterSpec)) return false;
+        ClusterSpec other = (ClusterSpec)o;
+        if ( ! other.type.equals(this.type)) return false;
+        if ( ! other.id.equals(this.id)) return false;
+        return true;
+    }
+
+    // TODO: Remove when no version older than 6.41 is used
     /** Returns whether this is equal, disregarding the group value */
+    @Deprecated
     public boolean equalsIgnoringGroup(Object o) {
         if (o == this) return true;
         if ( ! (o instanceof ClusterSpec)) return false;