[ARVADOS] updated: 2.1.0-818-gd8b81d83b

[Git user]

Summary of changes:
 .../aws/pillars/nginx_webshell_configuration.sls   |  2 +-
 tools/salt-install/provision.sh                    | 55 +++++++++++-----------
 2 files changed, 29 insertions(+), 28 deletions(-)

  discards  07cf2c8995e935ee08e950fd53242643834306e9 (commit)
       via  d8b81d83b6bab93c080bbc01e4fdfa269d8998d5 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (07cf2c8995e935ee08e950fd53242643834306e9)
            \
             N -- N -- N (d8b81d83b6bab93c080bbc01e4fdfa269d8998d5)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d8b81d83b6bab93c080bbc01e4fdfa269d8998d5
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Fri May 28 15:31:00 2021 -0300

    17607: shell node internal IP as a variable in multihost
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 89616528d..193ab502c 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -277,6 +277,7 @@ for f in $(ls "${SOURCE_PILLARS_DIR}"/*); do
        s#__WORKBENCH1_INT_IP__#${WORKBENCH1_INT_IP}#g;
        s#__WORKBENCH2_INT_IP__#${WORKBENCH2_INT_IP}#g;
        s#__DATABASE_INT_IP__#${DATABASE_INT_IP}#g;
+       s#__SHELL_INT_IP__#${SHELL_INT_IP}#g;
        s#__WORKBENCH_SECRET_KEY__#${WORKBENCH_SECRET_KEY}#g" \
   "${f}" > "${P_DIR}"/$(basename "${f}")
 done
@@ -338,6 +339,7 @@ if [ -d "${SOURCE_STATES_DIR}" ]; then
          s#__WEBSOCKET_EXT_SSL_PORT__#${WEBSOCKET_EXT_SSL_PORT}#g;
          s#__WORKBENCH1_EXT_SSL_PORT__#${WORKBENCH1_EXT_SSL_PORT}#g;
          s#__WORKBENCH2_EXT_SSL_PORT__#${WORKBENCH2_EXT_SSL_PORT}#g;
+         s#__SHELL_INT_IP__#${SHELL_INT_IP}#g;
          s#__WORKBENCH_SECRET_KEY__#${WORKBENCH_SECRET_KEY}#g" \
     "${f}" > "${F_DIR}/extra/extra"/$(basename "${f}")
   done

-----------------------------------------------------------------------


hooks/post-receive
--