Merge pull request #176 from yahoo/hmusum/remove-yinst-reference

Rename to avoid reference to yinst

4 files changed, 7 insertions, 7 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProviderImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProviderImpl.java
index 6d9737a0354..b1638c62359 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProviderImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProviderImpl.java
@@ -33,7 +33,7 @@ public class ComponentsProviderImpl implements ComponentsProvider{
         String baseHostName = java.util.Optional.ofNullable(System.getenv(ENV_HOSTNAME))
                 .orElseThrow(() -> new IllegalStateException("Environment variable " + ENV_HOSTNAME + " unset"));
 
-        Set<HostName> configServerHosts = Environment.getConfigServerHostsFromYinstSetting();
+        Set<HostName> configServerHosts = Environment.getConfigServerHosts();
         if (configServerHosts.isEmpty()) {
             throw new IllegalStateException("Environment setting for config servers missing or empty.");
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
index f9cf69c0b11..b4cf2fe237f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
@@ -232,7 +232,7 @@ public class DockerImpl implements Docker {
                                     .networkMode("none")
                                     .binds(applicationStorageToMount(containerName.asString()))
                                     .build())
-                    .env("CONFIG_SERVER_ADDRESS=" + Joiner.on(',').join(Environment.getConfigServerHostsFromYinstSetting())).
+                    .env("CONFIG_SERVER_ADDRESS=" + Joiner.on(',').join(Environment.getConfigServerHosts())).
                             hostname(hostName.s());
             if (minMainMemoryAvailableGb > 0.00001) {
                 containerConfigBuilder.memory((long) (GIGA * minMainMemoryAvailableGb));
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java
index 90f71006cd7..804c06dccae 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java
@@ -119,7 +119,7 @@ public class OrchestratorImpl implements Orchestrator {
     }
 
     public static OrchestratorImpl createOrchestratorFromSettings() {
-        final Set<HostName> configServerHosts = Environment.getConfigServerHostsFromYinstSetting();
+        final Set<HostName> configServerHosts = Environment.getConfigServerHosts();
         if (configServerHosts.isEmpty()) {
             throw new IllegalStateException("Environment setting for config servers missing or empty.");
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
index d6703326796..b5929653458 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
@@ -22,13 +22,13 @@ public class Environment {
 
     public enum NetworkType { normal, local, vm }
 
-    public static Set<HostName> getConfigServerHostsFromYinstSetting() {
-        final String yinstSetting = System.getenv(ENV_CONFIGSERVERS);
-        if (yinstSetting == null) {
+    public static Set<HostName> getConfigServerHosts() {
+        final String configServerHosts = System.getenv(ENV_CONFIGSERVERS);
+        if (configServerHosts == null) {
             return Collections.emptySet();
         }
 
-        final List<String> hostNameStrings = Arrays.asList(yinstSetting.split("[,\\s]+"));
+        final List<String> hostNameStrings = Arrays.asList(configServerHosts.split("[,\\s]+"));
         return hostNameStrings.stream()
                 .map(HostName::new)
                 .collect(Collectors.toSet());