[arvados] updated: 2.1.0-2632-gc8317d607

[git repository hosting]

Summary of changes:
 tools/salt-install/local.params.example.multiple_hosts      | 13 ++++++-------
 .../local.params.example.single_host_multiple_hostnames     |  1 -
 .../local.params.example.single_host_single_hostname        |  1 -
 tools/salt-install/provision.sh                             |  2 ++
 4 files changed, 8 insertions(+), 9 deletions(-)

       via  c8317d6077082b22518a39a489e4322d357d5348 (commit)
      from  a21c5e2fd2b95caf0884917c1a99d4485374b2c0 (commit)

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 c8317d6077082b22518a39a489e4322d357d5348
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Sun Jun 26 23:06:38 2022 -0400

    18870: Fixing declare
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index edbee413b..ade1ad467 100644
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -19,14 +19,13 @@ DEPLOY_USER=root
 # The mapping of nodes to roles
 # installer.sh will log in to each of these nodes and then provision
 # it for the specified roles.
-declare -A NODES
 NODES=(
-  [controller.${CLUSTER}.$DOMAIN]=api,controller,websocket,dispatcher,keepbalance
-  [keep0.${CLUSTER}.$DOMAIN]=keepstore
-  [keep1.${CLUSTER}.$DOMAIN]=keepstore
-  [keep.${CLUSTER}.$DOMAIN]=keepproxy,keepweb
-  [workbench.${CLUSTER}.$DOMAIN]=workbench,workbench2,webshell
-  [shell.${CLUSTER}.$DOMAIN]=shell
+  [controller.${CLUSTER}.${DOMAIN}]=api,controller,websocket,dispatcher,keepbalance
+  [keep0.${CLUSTER}.${DOMAIN}]=keepstore
+  [keep1.${CLUSTER}.${DOMAIN}]=keepstore
+  [keep.${CLUSTER}.${DOMAIN}]=keepproxy,keepweb
+  [workbench.${CLUSTER}.${DOMAIN}]=workbench,workbench2,webshell
+  [shell.${CLUSTER}.${DOMAIN}]=shell
 )
 
 # Host SSL port where you want to point your browser to access Arvados
diff --git a/tools/salt-install/local.params.example.single_host_multiple_hostnames b/tools/salt-install/local.params.example.single_host_multiple_hostnames
index f6b652612..20f334166 100644
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -18,7 +18,6 @@ DEPLOY_USER=root
 # The mapping of nodes to roles
 # installer.sh will log in to each of these nodes and then provision
 # it for the specified roles.
-declare -A NODES
 NODES=(
   [localhost]=api,controller,websocket,dispatcher,keepbalance,keepstore,keepproxy,keepweb,workbench,workbench2,webshell
 )
diff --git a/tools/salt-install/local.params.example.single_host_single_hostname b/tools/salt-install/local.params.example.single_host_single_hostname
index 58847e3c5..a68450094 100644
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -18,7 +18,6 @@ DEPLOY_USER=root
 # The mapping of nodes to roles
 # installer.sh will log in to each of these nodes and then provision
 # it for the specified roles.
-declare -A NODES
 NODES=(
   [localhost]=api,controller,websocket,dispatcher,keepbalance,keepstore,keepproxy,keepweb,workbench,workbench2,webshell
 )
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 3c5fb41e0..da3ef88a8 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -237,6 +237,8 @@ T_DIR="/tmp/cluster_tests"
 
 arguments ${@}
 
+declare -A NODES
+
 if [ -s ${CONFIG_FILE} ]; then
   source ${CONFIG_FILE}
 else

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


hooks/post-receive
--