feat(provision): pin arvados version to latest stable

refs #17246
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 5fbdc6a77418705c3376c7e54ddf09e2475c7a24..827d65db28d4ad99089f42d47a2e07d94cf941ef 100644 (file)
--- 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 <i>local.params</i> file. Pay attention to the <b>*_IN
 
 The <i>multi_host</i> 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 <i>USE_LETSENCRYPT=no</i>.
 
 
 The <i>multi_host</i> 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 <i>USE_LETSENCRYPT=no</i>.
 

-## "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 <i>pillars/arvados.sls</i> file, where you will need to provide some information that can be retrieved as output of the terraform run.
 
 
 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 <i>pillars/arvados.sls</i> 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 5d7991c987429b8fb2a31918462d9cd7a8132199..f2a8ee5704dc08625a541678e2a660ee440a1714 100644 (file)
--- 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 <i>local.params</i> file.
 
 
 Edit the variables in the <i>local.params</i> 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 <i>pillars/arvados.sls</i> one. Any extra <i>state</i> file you add under <i>local_config_dir/states</i> will be added to the salt run and applied to the host.
 
 
 If you want or need further customization, you can edit the Saltstack pillars and states files. Pay particular attention to the <i>pillars/arvados.sls</i> one. Any extra <i>state</i> file you add under <i>local_config_dir/states</i> 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 ffe60baec502cc10c0ae8ccc96cc53323baaa7a1..6a5bc175ca7604b9a91baf8766788efd5a3d8924 100644 (file)
--- 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 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
 
 # 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 92915925996e0c4f57aa76543adacb405a7d1ff4..6dd47722c19d67ef3b0c49a0be7976cb3fcae63d 100644 (file)
--- 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 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
 
 # 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 ffdb9ecc4422e68c16598ee9cba5381019a00ea7..fda42a9c745ad5f7feb3e219ea85bd29b681c503 100644 (file)
--- 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 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
 
 # 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 7e3788fe5d74e0cc800f7243d9e3b538dbb512ba..02da9933bdeab991415f4956257f5a9c22a5abf4 100755 (executable)
--- 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"
 WORKBENCH2_EXT_SSL_PORT=3001
 
 RELEASE="production"

-VERSION="latest"
+VERSION="2.1.2-1"

 
 # Formulas versions
 ARVADOS_TAG="master"
 
 # Formulas versions
 ARVADOS_TAG="master"