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 4c932969460..92c98bc7601 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -77,7 +77,7 @@ public class Curator implements AutoCloseable {
 
             String spec = String.format("%s:%d", server.hostname(), server.port());
 
-            if (config.zookeeperLocalhostAffinity() && server.hostname().equals(thisServer)) {
+            if ((config.zookeeperLocalhostAffinity() || config.system().equals("cd")) && server.hostname().equals(thisServer)) {
                 // Only connect to localhost server if possible, to save network traffic
                 // and balance load.
                 return spec;