Merge pull request #4653 from vespa-engine/hmusum/prefer-zookeeper-on-localhost-in-cd-take-2

Prefer zookeeper server on localhost for CD

1 files changed, 1 insertions, 1 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index 5f7fa4a4e51..f875af307c5 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -71,7 +71,7 @@ public class Curator implements AutoCloseable {
     }
 
     private Curator(ConfigserverConfig configserverConfig, String zooKeeperEnsembleConnectionSpec) {
-        this(configserverConfig.zookeeperLocalhostAffinity() ?
+        this((configserverConfig.zookeeperLocalhostAffinity() || configserverConfig.system().equals("cd")) ?
                 createConnectionSpecForLocalhost(configserverConfig) : zooKeeperEnsembleConnectionSpec,
                 zooKeeperEnsembleConnectionSpec);
     }