haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

website/docs: update salt docs

This commit is contained in:
Mitchell Hashimoto 2015-02-24 09:32:55 -08:00
parent 3a142cbf30
commit 5a7abc2b2f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
website/docs/source/v2/provisioning/salt.html.md
View File

@ -66,6 +66,9 @@ you can specify a branch, tag, or any treeish. Not supported on Windows.
if they are already detected, default `false` if they are already detected, default `false`
* `bootstrap_options` (string) - Additional command-line options to
pass to the bootstrap script.
## Minion Options ## Minion Options
These only make sense when `no_minion` is `false`. These only make sense when `no_minion` is `false`.
@ -112,13 +115,6 @@ These may be used to control the output of state execution:
Can be one of "all", "garbage", "trace", "debug", "info", or Can be one of "all", "garbage", "trace", "debug", "info", or
"warning". "warning".
## Miscellaneous
You can pass any additional command line options to the salt bootstrap script
with the following:
* `bootstrap_options` (string) - Command line options.
## Pillar Data ## Pillar Data
You can export pillar data for use during provisioning by using the ``pillar`` You can export pillar data for use during provisioning by using the ``pillar``