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

Updated the salt bootstra, and writing tests docs to fix some code block issues.

Browse source
This commit is contained in:
Forrest Alvarez 2014-07-10 15:47:51 -07:00
parent fd2ecf41bd
commit 0a96a4ca09
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/topics/tutorials/salt_bootstrap.rst
View file

@ -59,7 +59,7 @@ bottom and use the instructions for `Installing via an Insecure One-Liner`_
Using ``curl`` to install latest git:
.. code:: console
.. code:: bash
curl -L https://bootstrap.saltstack.com -o install_salt.sh
sudo sh install_salt.sh git develop
@ -67,7 +67,7 @@ Using ``curl`` to install latest git:
Using ``wget`` to install your distribution's stable packages:
.. code:: console
.. code:: bash
wget -O install_salt.sh https://bootstrap.saltstack.com
sudo sh install_salt.sh
@ -75,14 +75,14 @@ Using ``wget`` to install your distribution's stable packages:
Install a specific version from git using ``wget``:
.. code:: console
.. code:: bash
wget -O install_salt.sh https://bootstrap.saltstack.com
sudo sh install_salt.sh -P git v0.16.4
If you already have python installed, ``python 2.6``, then it's as easy as:
.. code:: console
.. code:: bash
python -m urllib "https://bootstrap.saltstack.com" > install_salt.sh
sudo sh install_salt.sh git develop
@ -90,7 +90,7 @@ If you already have python installed, ``python 2.6``, then it's as easy as:
All python versions should support the following one liner:
.. code:: console
.. code:: bash
python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > install_salt.sh
sudo sh install_salt.sh git develop
@ -99,7 +99,7 @@ All python versions should support the following one liner:
On a FreeBSD base system you usually don't have either of the above binaries available. You **do**
have ``fetch`` available though:
.. code:: console
.. code:: bash
fetch -o install_salt.sh https://bootstrap.saltstack.com
sudo sh install_salt.sh
@ -107,21 +107,21 @@ have ``fetch`` available though:
If all you want is to install a ``salt-master`` using latest git:
.. code:: console
.. code:: bash
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh -M -N git develop
If you want to install a specific release version (based on the git tags):
.. code:: console
.. code:: bash
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh git v0.16.4
To install a specific branch from a git fork:
.. code:: console
.. code:: bash
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh -g https://github.com/myuser/salt.git git mybranch
@ -142,7 +142,7 @@ Examples
Installing the latest develop branch of Salt:
.. code:: console
.. code:: bash
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop

2
doc/topics/tutorials/writing_tests.rst
View file

@ -43,7 +43,7 @@ like package installation.
To write a destructive test import and use the `destructiveTest` decorator for
the test method:
.. code-block:: yaml
.. code-block:: python
import integration
from salttesting.helpers import destructiveTest