Use LinkedHashMap to get deterministic config order

2 files changed, 4 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java b/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java
index e22897903db..bbff0c26614 100644
--- a/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java
+++ b/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java
@@ -14,7 +14,7 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +33,7 @@ public class ModelNode<MODEL extends ConfigModel> implements ConfigModelInstance
     final Class<MODEL> clazz;
     final Constructor<MODEL> constructor;
     final List<MODEL> instances = new ArrayList<>();
-    private final Map<ComponentId, ModelNode> dependencies = new HashMap<>();
+    private final Map<ComponentId, ModelNode> dependencies = new LinkedHashMap<>();
 
     public ModelNode(ConfigModelBuilder<MODEL> builder) {
         this.id = builder.getId();
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index 8bf6dc7f1d9..f12b7697ef1 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -56,7 +56,7 @@ public class InMemoryProvisioner implements HostProvisioner {
     private final Map<ClusterSpec, List<HostSpec>> allocations = new LinkedHashMap<>();
 
     /** Indexes must be unique across all groups in a cluster */
-    private final Map<Pair<ClusterSpec.Type, ClusterSpec.Id>, Integer> nextIndexInCluster = new HashMap<>();
+    private final Map<Pair<ClusterSpec.Type, ClusterSpec.Id>, Integer> nextIndexInCluster = new LinkedHashMap<>();
 
     /** Use this index as start index for all clusters */
     private final int startIndexForClusters;