Merge branch 'release-1.15'

joefitzgerald · May 7, 2014 · 9276a71 · 9276a71
2 parents 63952c9 + 045abf2
commit 9276a71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.15 (May 7th, 2014)
+
+* Update Puppet to 3.5.1 (#54)
+* Fix ISO Url for 2008 R2 (#56)
+
 ## v1.14 (May 6th, 2014)
 
 * Compact generated VMs using ultradefrag and sdelete (#53)

diff --git a/scripts/puppet.bat b/scripts/puppet.bat
@@ -1,10 +1,10 @@
 if not exist "C:\Windows\Temp\puppet.msi" (
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://downloads.puppetlabs.com/windows/puppet-3.4.3.msi', 'C:\Windows\Temp\puppet.msi')" <NUL
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://downloads.puppetlabs.com/windows/puppet-3.5.1.msi', 'C:\Windows\Temp\puppet.msi')" <NUL
 )
 
 :: http://docs.puppetlabs.com/pe/latest/install_windows.html
 msiexec /qn /i C:\Windows\Temp\puppet.msi /log C:\Windows\Temp\puppet.log
 
 <nul set /p ".=;C:\Program Files (x86)\Puppet Labs\Puppet\bin" >> C:\Windows\Temp\PATH
 set /p PATH=<C:\Windows\Temp\PATH
-setx PATH "%PATH%" /m
+setx PATH "%PATH%" /m
diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json
@@ -1,7 +1,7 @@
 {
   "builders": [{
     "type": "vmware-iso",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
     "iso_checksum_type": "md5",
     "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
     "headless": true,