From dddaa9f008f8cfb6d1dec5379b3ef2e32ca54565 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 1 Jun 2022 12:17:16 -0400 Subject: [PATCH] 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 --- tools/salt-install/local.params.example.multiple_hosts | 2 +- .../local.params.example.single_host_multiple_hostnames | 2 +- .../local.params.example.single_host_single_hostname | 2 +- tools/salt-install/provision.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts index 0ddec2c7cc..31a69e9840 100644 --- 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 -# 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 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 3cdc1ec8f1..2ce1556511 100644 --- 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 -# 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 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 45842b3dcc..7add9868d9 100644 --- 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 -# 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 diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index dc4a7b70ff..c8e2604799 100755 --- 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 - echo >&2 "ERROR: must be exactly 5 alphanumeric characters long" + echo >&2 "ERROR: 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 -- 2.30.2