fix(salt): choose repo

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

diff --git a/tools/salt-install/README.md b/tools/salt-install/README.md
new file mode 100644 (file)
index 0000000..3175224
--- /dev/null
+++ b/tools/salt-install/README.md
@@ -0,0 +1,20 @@
+[comment]: # (Copyright © The Arvados Authors. All rights reserved.)
+[comment]: # ()
+[comment]: # (SPDX-License-Identifier: CC-BY-SA-3.0)
+
+# Arvados install with Saltstack
+
+##### About
+
+This directory holds a small script to install Arvados on a single node, using the
+[Saltstack arvados-formula](https://github.com/saltstack-formulas/arvados-formula)
+in master-less mode.
+
+The fastest way to get it running is to modify the first lines in the `provision.sh`
+script to suit your needs, copy it in the host where you want to install Arvados
+and run it as root.
+
+There's an example `Vagrantfile` also, to install it in a vagrant box if you want
+to try it locally.
+
+For more information, please read https://doc.arvados.org/v2.1/install/install-using-salt.html

diff --git a/tools/salt-install/bin/provision.sh b/tools/salt-install/provision.sh
similarity index 95%
rename from tools/salt-install/bin/provision.sh
rename to tools/salt-install/provision.sh
index d47013018d72134b2b7a777c809d2e3756901a39..0cae78b35fc5e3db464028ddc7848c7b148bf04c 100755 (executable)
--- a/tools/salt-install/bin/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -15,6 +15,7 @@
 
 # If branch is set, the script will switch to it before running salt
 BRANCH="refactor-config-add-service"
+RELEASE="testing"
 
 CLUSTER="arva2"
 DOMAIN="arv.local"
@@ -79,8 +80,9 @@ base:
     - nginx_controller_configuration
     - nginx_keepproxy_configuration
     - nginx_keepweb_configuration
-    - nginx_passenger          
+    - nginx_passenger
     - nginx_websocket_configuration
+    - nginx_webshell_configuration
     - nginx_workbench2_configuration
     - nginx_workbench_configuration
     - postgresql
@@ -99,7 +101,7 @@ if [ "x${BRANCH}" != "x" ]; then
   cd -
 fi
 
-sed "s/example.net/${DOMAIN}/g; s/fixme/${CLUSTER}/g" \
+sed "s/example.net/${DOMAIN}/g; s/fixme/${CLUSTER}/g; s/release: development/release: ${RELEASE}/g" \
   ${F_DIR}/arvados-formula/test/salt/pillar/arvados_dev.sls > ${P_DIR}/arvados.sls
 
 # Replace cluster and domain name in the example pillars