Merge pull request #5591 from vespa-engine/arnej/handle-new-varname-for-configservers

handle VESPA_CONFIGSERVERS

2 files changed, 2 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
index faf25a16321..92d7589ea43 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
@@ -392,7 +392,7 @@ public class ConfigCurator {
         catch (Exception e) {
             log.log(LogLevel.ERROR, "Unable to contact ZooKeeper on " + curator.connectionSpec() +
                     ". Please verify for all configserver nodes that " +
-                    "services.addr_configserver points to the correct configserver(s), " +
+                    "VESPA_CONFIGSERVERS points to the correct configserver(s), " +
                     "the same configserver(s) as in services.xml, and that they are started. " +
                     "Check the log(s) for configserver errors. Aborting.", e);
         }
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index eed616cfe35..daad42f7895 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -87,7 +87,7 @@ fixddir ${VESPA_HOME}/var/zookeeper/version-2
 
 ${VESPA_HOME}/libexec/vespa/vespa-config.pl -isthisaconfigserver 1>/dev/null
 if [ "$?" != "0" ] ; then
-    echo "Not able to start config server, host `hostname` is not part of 'services.addr_configserver'"
+    echo "Not able to start config server, host `hostname` is not part of 'VESPA_CONFIGSERVERS'"
     exit 1;
 fi