18870: Fixing declare

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index edbee413bd96ca6c08e825d4fdd68ca6dffe5ed8..ade1ad46715fd0440b703aa63b5379ff4cf73ce1 100644 (file)
--- 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 f6b6526129e6e85fc88c42cb329e37004e3b407b..20f334166e419ee806b608ac37fd3a27b10dca82 100644 (file)
--- 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 58847e3c5ea04bba70c60e9a9df6796eceeed274..a68450094161accb43ef472def621e15b20b2d79 100644 (file)
--- 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 3c5fb41e0ffc4cf02469e8ffb6d597aca419ea45..da3ef88a823c6bc61c646dc5ab21d328eb950ffe 100755 (executable)
--- 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