From 9de3c481debc1b9c3327a885a77c4c6410d8adc1 Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Tue, 14 Apr 2015 05:57:16 -0700 Subject: [PATCH] Salt bootstrap ps1 should be idempotent - WinRM communicator error detection was tightened up thus exposing an issue in the salt bootstrap script creating directories that already exist. --- plugins/provisioners/salt/bootstrap-salt.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/provisioners/salt/bootstrap-salt.ps1 b/plugins/provisioners/salt/bootstrap-salt.ps1 index c8d7e7ab2..e0bd34d28 100644 --- a/plugins/provisioners/salt/bootstrap-salt.ps1 +++ b/plugins/provisioners/salt/bootstrap-salt.ps1 @@ -2,10 +2,10 @@ $version = '2014.1.10' # 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 -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 if (Test-Path C:\tmp\minion.pem) {