From 4090574822afd6a7b48ccd277ba84c3cc6244e71 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Sun, 26 Jun 2022 23:06:38 -0400 Subject: [PATCH] 18870: Fixing declare Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .../local.params.example.multiple_hosts | 13 ++++++------- ...al.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(-) diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts index edbee413bd..ade1ad4671 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 f6b6526129..20f334166e 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 58847e3c5e..a684500941 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 3c5fb41e0f..da3ef88a82 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 -- 2.30.2