Merge pull request #16465 from vespa-engine/hmusum/cleanup-2

Remove use of zk_port property

1 files changed, 3 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
index 25dbd62e647..9d8a9707d12 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin;
 
 import com.yahoo.collections.CollectionUtil;
@@ -12,7 +12,7 @@ import java.util.List;
  */
 public class ZooKeepersConfigProvider implements ZookeepersConfig.Producer {
 
-    public static final int zkPort = Integer.getInteger("zk_port", 2181);
+    public static final int zooKeeperClientPort = 2181;
 
     private final List<Configserver> configServers;
 
@@ -27,7 +27,7 @@ public class ZooKeepersConfigProvider implements ZookeepersConfig.Producer {
     public List<String> getZooKeepers() {
         List<String> servers = new ArrayList<>();
         for (Configserver server : configServers) {
-            servers.add(server.getHostName() + ":" + zkPort);
+            servers.add(server.getHostName() + ":" + zooKeeperClientPort);
         }
         return servers;
     }