From 6d0dd22864b5c9d4508a4d994b2538e7a6eca3fb Mon Sep 17 00:00:00 2001 From: Marno van der Molen Date: Mon, 19 May 2014 14:01:31 +0200 Subject: [PATCH] Also copy minion config in bootstrap-salt.ps1 & update Salt docs to mention syndic/master not supported on Windows --- plugins/provisioners/salt/bootstrap-salt.ps1 | 3 ++- website/docs/source/v2/provisioning/salt.html.md | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/provisioners/salt/bootstrap-salt.ps1 b/plugins/provisioners/salt/bootstrap-salt.ps1 index 6f284a426..61ce14ad5 100644 --- a/plugins/provisioners/salt/bootstrap-salt.ps1 +++ b/plugins/provisioners/salt/bootstrap-salt.ps1 @@ -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 cp C:\tmp\minion.pem C:\salt\conf\pki\minion\ cp C:\tmp\minion.pub C:\salt\conf\pki\minion\ +cp C:\tmp\minion C:\salt\conf\ # Detect architecture if ([IntPtr]::Size -eq 4) { diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md index 2f2f3fe4f..f66ac7c60 100644 --- a/website/docs/source/v2/provisioning/salt.html.md +++ b/website/docs/source/v2/provisioning/salt.html.md @@ -48,18 +48,19 @@ masterless setup. * `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` * `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 -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, -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 if they are already detected, default `false`