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

Merge pull request #5593 from mitchellh/make-salt-bootstrap-idempotent 

Salt bootstrap ps1 should be idempotent
This commit is contained in:
Shawn Neal 2015-04-14 07:40:15 -07:00
parent 1b99272b13 9de3c481de
commit 27599ee897
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,10 @@
$version = '2014.1.10' $version = '2014.1.10'
# Create C:\tmp\ - if Vagrant doesn't upload keys and/or config it might not exist # Create C:\tmp\ - if Vagrant doesn't upload keys and/or config it might not exist
New-Item C:\tmp\ -ItemType directory | out-null New-Item C:\tmp\ -ItemType directory -force | out-null
# Copy minion keys & config 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 -force | out-null
# Check if minion keys have been uploaded # Check if minion keys have been uploaded
if (Test-Path C:\tmp\minion.pem) { if (Test-Path C:\tmp\minion.pem) {