From: Javier Bértoli Date: Mon, 19 Apr 2021 18:52:17 +0000 (-0300) Subject: feat(provision): pin arvados version to latest stable X-Git-Tag: 2.2.0~65^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e3e255e8aca055a51b9c6722719e712cdf6e650e feat(provision): pin arvados version to latest stable refs #17246 Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid index 5fbdc6a774..827d65db28 100644 --- a/doc/install/salt-multi-host.html.textile.liquid +++ b/doc/install/salt-multi-host.html.textile.liquid @@ -85,7 +85,7 @@ Edit the variables in the local.params file. Pay attention to the *_IN The multi_host include LetsEncrypt salt code to automatically request and install the certificates for the public-facing hosts (API, Workbench) so it will need the hostnames to be reachable from the Internet. If this cluster will not be the case, please set the variable USE_LETSENCRYPT=no. -## "Further customization of the installation (modifying the salt pillars and states)":#further_customization +h3(#further_customization). Further customization of the installation (modifying the salt pillars and states) You will need further customization to suit your environment, which can be done editing the Saltstack pillars and states files. Pay particular attention to the pillars/arvados.sls file, where you will need to provide some information that can be retrieved as output of the terraform run. diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid index 5d7991c987..f2a8ee5704 100644 --- a/doc/install/salt-single-host.html.textile.liquid +++ b/doc/install/salt-single-host.html.textile.liquid @@ -60,7 +60,7 @@ cp -r config_examples/single_host/multiple_hostnames local_config_dir Edit the variables in the local.params file. -## "Further customization of the installation (modifying the salt pillars and states)":#further_customization +h3(#further_customization). Further customization of the installation (modifying the salt pillars and states) If you want or need further customization, you can edit the Saltstack pillars and states files. Pay particular attention to the pillars/arvados.sls one. Any extra state file you add under local_config_dir/states will be added to the salt run and applied to the host. diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts index ffe60baec5..6a5bc175ca 100644 --- a/tools/salt-install/local.params.example.multiple_hosts +++ b/tools/salt-install/local.params.example.multiple_hosts @@ -71,9 +71,8 @@ USE_LETSENCRYPT="yes" # Which release of Arvados repo you want to use RELEASE="production" -# Which version of Arvados you want to install. Defaults to 'latest' -# in the desired repo -VERSION="latest" +# Which version of Arvados you want to install. Defaults to latest stable +# VERSION="2.1.2-1" # This is an arvados-formula setting. # If branch is set, the script will switch to it before running salt 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 9291592599..6dd47722c1 100644 --- a/tools/salt-install/local.params.example.single_host_multiple_hostnames +++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames @@ -56,9 +56,8 @@ USE_LETSENCRYPT="no" # Which release of Arvados repo you want to use RELEASE="production" -# Which version of Arvados you want to install. Defaults to 'latest' -# in the desired repo -VERSION="latest" +# Which version of Arvados you want to install. Defaults to latest stable +# VERSION="2.1.2-1" # This is an arvados-formula setting. # If branch is set, the script will switch to it before running salt 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 ffdb9ecc44..fda42a9c74 100644 --- a/tools/salt-install/local.params.example.single_host_single_hostname +++ b/tools/salt-install/local.params.example.single_host_single_hostname @@ -65,9 +65,8 @@ USE_LETSENCRYPT="no" # Which release of Arvados repo you want to use RELEASE="production" -# Which version of Arvados you want to install. Defaults to 'latest' -# in the desired repo -VERSION="latest" +# Which version of Arvados you want to install. Defaults to latest stable +# VERSION="2.1.2-1" # This is an arvados-formula setting. # If branch is set, the script will switch to it before running salt diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 7e3788fe5d..02da9933bd 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -127,7 +127,7 @@ WORKBENCH1_EXT_SSL_PORT=443 WORKBENCH2_EXT_SSL_PORT=3001 RELEASE="production" -VERSION="latest" +VERSION="2.1.2-1" # Formulas versions ARVADOS_TAG="master"