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 82fb6f4ec9243d2493feec7f5c3574bf55502fe1..6e0deb49c67903f1dfa5ddfb3a0d8e9e0b83e4c3 100644 (file)
--- 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 5dcc1d7c916ba168a53a3f5f18496f2abd6c3254..af2de2e72a870de57dc35fd76d85693d21e7a314 100644 (file)
--- 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 0ecb7217d7c7aa28d70e497932e007bcbbf53476..32fcb4513903a654af982d8ecc3811f33648526a 100755 (executable)
--- 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;