[ARVADOS] updated: 2.1.0-488-ge3e255e8a
Git user
git at public.arvados.org
Tue Apr 20 18:31:24 UTC 2021
Summary of changes:
doc/install/salt-multi-host.html.textile.liquid | 2 +-
doc/install/salt-single-host.html.textile.liquid | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
discards 329b82859233d82c2b3cf6f30235945ac885d99c (commit)
via e3e255e8aca055a51b9c6722719e712cdf6e650e (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (329b82859233d82c2b3cf6f30235945ac885d99c)
\
N -- N -- N (e3e255e8aca055a51b9c6722719e712cdf6e650e)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit e3e255e8aca055a51b9c6722719e712cdf6e650e
Author: Javier Bértoli <jbertoli at curii.com>
Date: Mon Apr 19 15:52:17 2021 -0300
feat(provision): pin arvados version to latest stable
refs #17246
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 5fbdc6a77..827d65db2 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 <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>.
-## "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.
diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid
index 5d7991c98..f2a8ee570 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 <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.
diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index ffe60baec..6a5bc175c 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 929159259..6dd47722c 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 ffdb9ecc4..fda42a9c7 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 7e3788fe5..02da9933b 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"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list