From a766778e0f838f9713ec9f4eb048b80acf5cd97f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Tue, 25 May 2021 14:21:39 -0300 Subject: [PATCH] 17603: Separate shell's IP from webshell's MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../multi_host/aws/states/host_entries.sls | 8 +++++++- tools/salt-install/local.params.example.multiple_hosts | 1 + tools/salt-install/provision.sh | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) 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; -- 2.30.2