From: Peter Amstutz Date: Wed, 26 May 2021 21:19:59 +0000 (-0400) Subject: 17703: Salt install docs point to versioned branches to get the scripts. X-Git-Tag: 2.2.0~9^2~1 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/07a1f9567e872fcc1df6ba23fa1f75d84848a15e 17703: Salt install docs point to versioned branches to get the scripts. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid index 827d65db28..9322f69863 100644 --- a/doc/install/salt-multi-host.html.textile.liquid +++ b/doc/install/salt-multi-host.html.textile.liquid @@ -56,11 +56,19 @@ Check "the Arvados terraform documentation":/doc/install/terraform.html for more h2(#multi_host). Multi host install using the provision.sh script -This is a package-based installation method. The Salt scripts are available from the "tools/salt-install":https://github.com/arvados/arvados/tree/master/tools/salt-install directory in the Arvados git repository. +{% if site.current_version %} +{% assign branchname = site.current_version | slice: 1, 5 | append: '-dev' %} +{% else %} +{% assign branchname = 'master' %} +{% endif %} -This procedure will install all the main Arvados components to get you up and running in a multi host environment. +This is a package-based installation method. Start with the @provision.sh@ script which is available by cloning the @{{ branchname }}@ branch from "https://git.arvados.org/arvados.git":https://git.arvados.org/arvados.git . The @provision.sh@ script and its supporting files can be found in the "arvados/tools/salt-install":https://git.arvados.org/arvados.git/tree/refs/heads/{{ branchname }}:/tools/salt-install directory in the Arvados git repository. -We suggest you to use the @provision.sh@ script to deploy Arvados, which is implemented with the @arvados-formula@ in a Saltstack master-less setup. After setting up a few variables in a config file (next step), you'll be ready to run it and get Arvados deployed. +This procedure will install all the main Arvados components to get you up and running in a multi-host environment. + +The @provision.sh@ script will help you deploy Arvados by preparing your environment to be able to run the installer, then running it. The actual installer is located at "arvados-formula":https://git.arvados.org/arvados-formula.git/tree/refs/heads/{{ branchname }} and will be cloned during the running of the @provision.sh@ script. The installer is built using "Saltstack":https://saltproject.io/ and @provision.sh@ performs the install using master-less mode. + +After setting up a few variables in a config file (next step), you'll be ready to run it and get Arvados deployed. h3(#create_a_compute_image). Create a compute image @@ -163,7 +171,7 @@ ssh user@host sudo ./provision.sh --config local.params --roles shell -h2(#initial_user). Initial user and login +h2(#initial_user). Initial user and login At this point you should be able to log into the Arvados cluster. The initial URL will be: diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid index f2a8ee5704..39eb47965a 100644 --- a/doc/install/salt-single-host.html.textile.liquid +++ b/doc/install/salt-single-host.html.textile.liquid @@ -25,11 +25,19 @@ h2(#single_host). Single host install using the provision.sh script NOTE: The single host installation is not recommended for production use. -This is a package-based installation method. The Salt scripts are available from the "tools/salt-install":https://github.com/arvados/arvados/tree/master/tools/salt-install directory in the Arvados git repository. +{% if site.current_version %} +{% assign branchname = site.current_version | slice: 1, 5 | append: '-dev' %} +{% else %} +{% assign branchname = 'master' %} +{% endif %} + +This is a package-based installation method. Start with the @provision.sh@ script which is available by cloning the @{{ branchname }}@ branch from "https://git.arvados.org/arvados.git":https://git.arvados.org/arvados.git . The @provision.sh@ script and its supporting files can be found in the "arvados/tools/salt-install":https://git.arvados.org/arvados.git/tree/refs/heads/{{ branchname }}:/tools/salt-install directory in the Arvados git repository. This procedure will install all the main Arvados components to get you up and running in a single host. The whole installation procedure takes somewhere between 15 to 60 minutes, depending on the host resources and its network bandwidth. As a reference, on a virtual machine with 1 core and 1 GB RAM, it takes ~25 minutes to do the initial install. -We suggest you to use the @provision.sh@ script to deploy Arvados, which is implemented with the @arvados-formula@ in a Saltstack master-less setup. After setting up a few variables in a config file (next step), you'll be ready to run it and get Arvados deployed. +The @provision.sh@ script will help you deploy Arvados by preparing your environment to be able to run the installer, then running it. The actual installer is located at "arvados-formula":https://git.arvados.org/arvados-formula.git/tree/refs/heads/{{ branchname }} and will be cloned during the running of the @provision.sh@ script. The installer is built using "Saltstack":https://saltproject.io/ and @provision.sh@ performs the install using master-less mode. + +After setting up a few variables in a config file (next step), you'll be ready to run it and get Arvados deployed. h2(#choose_configuration). Choose the desired configuration @@ -145,7 +153,7 @@ echo "${HOST_IP} api keep keep0 collections download ws workbench workbench2 ${C -h2(#initial_user). Initial user and login +h2(#initial_user). Initial user and login At this point you should be able to log into the Arvados cluster. The initial URL will be: