Use new method only for getting admin cluster node architecture

1 files changed, 3 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 0ee9bc84ff7..fe9ab82637f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -211,7 +211,7 @@ public class ModelContextImpl implements ModelContext {
         private final boolean useQrserverServiceName;
         private final boolean avoidRenamingSummaryFeatures;
         private final boolean experimentalSdParsing;
-        private final Architecture adminClusterNodeResourcesArchitecture;
+        private final Architecture adminClusterArchitecture;
 
         public FeatureFlags(FlagSource source, ApplicationId appId, Version version) {
             this.defaultTermwiseLimit = flagValue(source, appId, version, Flags.DEFAULT_TERM_WISE_LIMIT);
@@ -260,7 +260,7 @@ public class ModelContextImpl implements ModelContext {
             this.useQrserverServiceName = flagValue(source, appId, version, Flags.USE_QRSERVER_SERVICE_NAME);
             this.avoidRenamingSummaryFeatures = flagValue(source, appId, version, Flags.AVOID_RENAMING_SUMMARY_FEATURES);
             this.experimentalSdParsing = flagValue(source, appId, version, Flags.EXPERIMENTAL_SD_PARSING);
-            this.adminClusterNodeResourcesArchitecture = Architecture.valueOf(flagValue(source, appId, version, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE));
+            this.adminClusterArchitecture = Architecture.valueOf(flagValue(source, appId, version, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE));
         }
 
         @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
@@ -311,8 +311,7 @@ public class ModelContextImpl implements ModelContext {
         @Override public boolean useQrserverServiceName() { return useQrserverServiceName; }
         @Override public boolean avoidRenamingSummaryFeatures() { return avoidRenamingSummaryFeatures; }
         @Override public boolean experimentalSdParsing() { return experimentalSdParsing; }
-        @Override public String adminClusterNodeArchitecture() { return adminClusterArchitecture().name(); }
-        @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; }
+        @Override public Architecture adminClusterArchitecture() { return adminClusterArchitecture; }
 
         private static <V> V flagValue(FlagSource source, ApplicationId appId, Version vespaVersion, UnboundFlag<? extends V, ?, ?> flag) {
             return flag.bindTo(source)