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

Merge pull request #5638 from dmangot/master 

fix master_config documentation
This commit is contained in:
Seth Vargo 2015-05-30 21:20:32 -07:00
parent 6bfee51389 25639ab6c2
commit a68155c996
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public key
## Master Options ## Master Options
These only make sense when `install_master` is `true`. These only make sense when `install_master` is `true`.
* `master_config` (string, default: "salt/minion") * `master_config` (string, default: "salt/master")
Path to a custom salt master config file Path to a custom salt master config file
* `master_key` (salt/key/master.pem) - Path to your master key * `master_key` (salt/key/master.pem) - Path to your master key