From: Javier Bértoli <jbertoli@curii.com>
Date: Tue, 25 May 2021 17:21:39 +0000 (-0300)
Subject: 17603: Separate shell's IP from webshell's
X-Git-Tag: 2.2.0~6^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a766778e0f838f9713ec9f4eb048b80acf5cd97f

17603: Separate shell's IP from webshell's

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

diff --git a/tools/salt-install/config_examples/multi_host/aws/states/host_entries.sls b/tools/salt-install/config_examples/multi_host/aws/states/host_entries.sls
index 82fb6f4ec9..6e0deb49c6 100644
--- a/tools/salt-install/config_examples/multi_host/aws/states/host_entries.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/states/host_entries.sls
@@ -52,9 +52,15 @@ extra_extra_hosts_entries_etc_hosts_keepweb_host_present:
       - download.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
       - collections.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
 
-extra_extra_hosts_entries_etc_hosts_shell_host_present:
+extra_extra_hosts_entries_etc_hosts_webshell_host_present:
   host.present:
     - ip: __WEBSHELL_INT_IP__
+    - names:
+      - webshell.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
+
+extra_extra_hosts_entries_etc_hosts_shell_host_present:
+  host.present:
+    - ip: __SHELL_INT_IP__
     - names:
       - shell.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
 
diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 5dcc1d7c91..af2de2e72a 100644
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -40,6 +40,7 @@ WORKBENCH1_INT_IP=10.0.0.5
 WORKBENCH2_INT_IP=10.0.0.5
 WEBSHELL_INT_IP=10.0.0.5
 DATABASE_INT_IP=10.0.0.6
+SHELL_INT_IP=10.0.0.7
 
 INITIAL_USER="admin"
 INITIAL_USER_PASSWORD="password"
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 0ecb7217d7..32fcb45139 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -273,6 +273,7 @@ for f in $(ls "${SOURCE_PILLARS_DIR}"/*); do
        s#__KEEPSTORE1_INT_IP__#${KEEPSTORE1_INT_IP}#g;
        s#__KEEPWEB_INT_IP__#${KEEPWEB_INT_IP}#g;
        s#__WEBSHELL_INT_IP__#${WEBSHELL_INT_IP}#g;
+       s#__SHELL_INT_IP__#${SHELL_INT_IP}#g;
        s#__WORKBENCH1_INT_IP__#${WORKBENCH1_INT_IP}#g;
        s#__WORKBENCH2_INT_IP__#${WORKBENCH2_INT_IP}#g;
        s#__DATABASE_INT_IP__#${DATABASE_INT_IP}#g;