Provision script fix: clarify that the cluster id must be 5 lowercase

alphanumeric characters.

refs #19169

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 0ddec2c7cc593ec31bdc99b6bb8718207285a9c5..31a69e9840cdfabbee21609b662816b7df60c362 100644 (file)
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -5,7 +5,7 @@
 
 # These are the basic parameters to configure the installation
 
 
 # These are the basic parameters to configure the installation
 

-# The FIVE ALPHANUMERIC CHARACTERS name you want to give your cluster
+# The Arvados cluster ID, needs to be 5 lowercase alphanumeric characters.

 CLUSTER="cluster_fixme_or_this_wont_work"
 
 # The domainname you want tou give to your cluster's hosts
 CLUSTER="cluster_fixme_or_this_wont_work"
 
 # The domainname you want tou give to your cluster's hosts

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 3cdc1ec8f1e18cef9088630242b43f6d3bc56fa5..2ce1556511bc7d57ddc5a58f53b5840de7353abf 100644 (file)
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -5,7 +5,7 @@
 
 # These are the basic parameters to configure the installation
 
 
 # These are the basic parameters to configure the installation
 

-# The FIVE ALPHANUMERIC CHARACTERS name you want to give your cluster
+# The Arvados cluster ID, needs to be 5 lowercase alphanumeric characters.

 CLUSTER="cluster_fixme_or_this_wont_work"
 
 # The domainname you want tou give to your cluster's hosts
 CLUSTER="cluster_fixme_or_this_wont_work"
 
 # The domainname you want tou give to your cluster's hosts

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 45842b3dcc93bb097e93d2d3b93f715496201319..7add9868d9223f90c53d3ef209aa57d875a7328c 100644 (file)
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -5,7 +5,7 @@
 
 # These are the basic parameters to configure the installation
 
 
 # These are the basic parameters to configure the installation
 

-# The Arvados cluster ID, needs to be five alphanumeric characters.
+# The Arvados cluster ID, needs to be 5 lowercase alphanumeric characters.

 CLUSTER="cluster_fixme_or_this_wont_work"
 
 # The domainname for your cluster's hosts
 CLUSTER="cluster_fixme_or_this_wont_work"
 
 # The domainname for your cluster's hosts

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index dc4a7b70fff4cb4aa23b089b63a3c3d91a7dcef9..c8e260479953f66f844e6de9df7ce29df61714d1 100755 (executable)
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -262,7 +262,7 @@ if grep -q 'fixme_or_this_wont_work' ${CONFIG_FILE} ; then
 fi
 
 if ! grep -qE '^[[:alnum:]]{5}$' <<<${CLUSTER} ; then
 fi
 
 if ! grep -qE '^[[:alnum:]]{5}$' <<<${CLUSTER} ; then

-  echo >&2 "ERROR: <CLUSTER> must be exactly 5 alphanumeric characters long"
+  echo >&2 "ERROR: <CLUSTER> must be exactly 5 lowercase alphanumeric characters long"

   echo >&2 "Fix the cluster name in the 'local.params' file and re-run the provision script"
   exit 1
 fi
   echo >&2 "Fix the cluster name in the 'local.params' file and re-run the provision script"
   exit 1
 fi