Merge branch 'master' into freva/docker-coredump-handler

# Conflicts:
#	node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
#	node-admin/src/main/java/com/yahoo/vespa/hosted/node/maintenance/Maintainer.java

1 files changed, 13 insertions, 1 deletions

diff --git a/node-admin/scripts/etc-hosts.sh b/node-admin/scripts/etc-hosts.sh
index 68c6d0e1b34..6f1ed926976 100755
--- a/node-admin/scripts/etc-hosts.sh
+++ b/node-admin/scripts/etc-hosts.sh
@@ -9,8 +9,12 @@ declare -r CONFIG_SERVER_IP="$NETWORK_PREFIX.1.1"
 
 declare -r APP_HOSTNAME_PREFIX=cnode-
 declare -r APP_NETWORK_PREFIX="$NETWORK_PREFIX.2"
-
 declare -r NUM_APP_CONTAINERS=20  # Statically allocated number of nodes.
+
+declare -r SYSTEM_TEST_HOSTNAME_PREFIX=stest-
+declare -r SYSTEM_TEST_NETWORK_PREFIX="$NETWORK_PREFIX.3"
+declare -r NUM_SYSTEM_TEST_CONTAINERS=5  # Statically allocated number of nodes.
+
 declare -r HOSTS_FILE=/etc/hosts
 declare -r HOSTS_LINE_SUFFIX=" # Managed by etc-hosts.sh"
 
@@ -89,6 +93,14 @@ function StartAsRoot {
         local container_name="$APP_HOSTNAME_PREFIX$index"
         AddHost "$ip" "$container_name" "$HOSTS_FILE"
     done
+
+    local -i index=1
+    for ((; index <= NUM_SYSTEM_TEST_CONTAINERS; ++index))
+    do
+        local ip="$SYSTEM_TEST_NETWORK_PREFIX.$index"
+        local container_name="$SYSTEM_TEST_HOSTNAME_PREFIX$index"
+        AddHost "$ip" "$container_name" "$HOSTS_FILE"
+    done
 }
 
 StartAsRoot "$@"