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

Also copy minion config in bootstrap-salt.ps1 & update Salt docs to mention syndic/master not supported on Windows

This commit is contained in:
Marno van der Molen 2014-05-19 14:01:31 +02:00
parent 7cb50f8a12
commit 6d0dd22864
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/provisioners/salt/bootstrap-salt.ps1
View File

@ -1,7 +1,8 @@
# Copy minion keys to correct location # Copy minion keys & config to correct location
New-Item c:\salt\conf\pki\minion\ -ItemType directory | out-null New-Item c:\salt\conf\pki\minion\ -ItemType directory | out-null
cp C:\tmp\minion.pem C:\salt\conf\pki\minion\ cp C:\tmp\minion.pem C:\salt\conf\pki\minion\
cp C:\tmp\minion.pub C:\salt\conf\pki\minion\ cp C:\tmp\minion.pub C:\salt\conf\pki\minion\
cp C:\tmp\minion C:\salt\conf\
# Detect architecture # Detect architecture
if ([IntPtr]::Size -eq 4) { if ([IntPtr]::Size -eq 4) {

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

@ -48,18 +48,19 @@ masterless setup.
* `install_master` (boolean) - Should vagrant install the salt-master * `install_master` (boolean) - Should vagrant install the salt-master
on this machine on this machine. Not supported on Windows.
* `no_minion` (boolean) - Don't install the minion, default `false` * `no_minion` (boolean) - Don't install the minion, default `false`
* `install_syndic` (boolean) - Install the salt-syndic, default * `install_syndic` (boolean) - Install the salt-syndic, default
`false` `false`. Not supported on Windows.
* `install_type` (stable | git | daily | testing) - Whether to install from a * `install_type` (stable | git | daily | testing) - Whether to install from a
distribution's stable package manager, git tree-ish, daily ppa, or testing repository. distribution's stable package manager, git tree-ish, daily ppa, or testing repository.
Not supported on Windows.
* `install_args` (develop) - When performing a git install, * `install_args` (develop) - When performing a git install,
you can specify a branch, tag, or any treeish. you can specify a branch, tag, or any treeish. Not supported on Windows.
* `always_install` (boolean) - Installs salt binaries even * `always_install` (boolean) - Installs salt binaries even
if they are already detected, default `false` if they are already detected, default `false`