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

Update default minion version to latest (Python 2) 

Perform check to determine to include python version or not
This commit is contained in:
Jonathan LaBroad 2017-08-29 13:13:24 -04:00
parent 384848e92d
commit 8e3831b810
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ $startupType = "Manual"
# Version to install - default to latest if there is an issue # Version to install - default to latest if there is an issue
If ($version -notmatch "2\d{3}\.\d{1,2}\.\d+(\-\d{1})?"){ If ($version -notmatch "2\d{3}\.\d{1,2}\.\d+(\-\d{1})?"){
$version = '2016.11.3' $version = '2017.7.1'
} }
If ($pythonVersion -notmatch "\d+") { If ($pythonVersion -notmatch "\d+") {
@ -55,21 +55,17 @@ If ([IntPtr]::Size -eq 4) {
} }
# Download minion setup file # Download minion setup file
$possibleFilenames = @("Salt-Minion-$version-$arch-Setup.exe", "Salt-Minion-$version-Py$pythonVersion-$arch-Setup.exe") $minionFilename = "Salt-Minion-$version-$arch-Setup.exe"
foreach ($minionFilename in $possibleFilenames) { $versionYear = [regex]::Match($version, "\d+").Value
try { If ([convert]::ToInt32($versionYear) -ge 2017)
Write-Host "Downloading Salt minion installer $minionFilename" {
$webclient = New-Object System.Net.WebClient $minionFilename = "Salt-Minion-$version-Py$pythonVersion-$arch-Setup.exe"
$url = "https://repo.saltstack.com/windows/$minionFilename"
$file = "C:\tmp\salt.exe"
$webclient.DownloadFile($url, $file)
break
}
catch {
Write-Host "Unable to download $minionFilename"
}
} }
Write-Host "Downloading Salt minion installer $minionFilename"
$webclient = New-Object System.Net.WebClient
$url = "https://repo.saltstack.com/windows/$minionFilename"
$file = "C:\tmp\salt.exe"
$webclient.DownloadFile($url, $file)
# Install minion silently # Install minion silently
Write-Host "Installing Salt minion..." Write-Host "Installing Salt minion..."