saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31528 from vutny/cloud-bootstrap-doc

Browse source 
Correct Salt Cloud documentation about updating Salt Bootstrap script
This commit is contained in:
Mike Place 2016-02-29 08:30:59 -07:00
commit 5965319600
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/topics/cloud/cloud.rst
View file

@ -112,7 +112,7 @@ then the necessary port to log in, then a successful login that can be used to
install Salt. Minion configuration and keys will then be uploaded to a temporary
directory on the target by the appropriate function. On a Windows target, the
Windows Minion Installer will be run in silent mode. On a Linux/Unix target, a
deploy script (bootstrap-salt.sh, by default) will be run, which will
deploy script (``bootstrap-salt.sh``, by default) will be run, which will
auto-detect the operating system, and install Salt using its native package
manager. These do not need to be handled by the developer in the cloud module.

20
doc/topics/cloud/deploy.rst
View file

@ -135,7 +135,7 @@ executes it.
Updating Salt Bootstrap
=======================
Salt Bootstrap can be updated automatically with salt-cloud:
Salt Bootstrap can be updated automatically with ``salt-cloud``:
.. code-block:: bash
@ -143,8 +143,22 @@ Salt Bootstrap can be updated automatically with salt-cloud:
salt-cloud --update-bootstrap
Bear in mind that this updates to the latest (unstable) version, so use with
caution.
Bear in mind that this updates to the latest **stable** version from:
https://bootstrap.saltstack.com/stable/bootstrap-salt.sh
To update Salt Bootstrap script to the **develop** version, run the following
command on the Salt minion host with ``salt-cloud`` installed:
.. code-block:: bash
salt-call config.gather_bootstrap_script 'https://bootstrap.saltstack.com/develop/bootstrap-salt.sh'
Or just download the file manually:
.. code-block:: bash
curl -L 'https://bootstrap.saltstack.com/develop' > /etc/salt/cloud.deploy.d/bootstrap-salt.sh
Keeping /tmp/ Files