Update templates for Packer 1.6.0

StefanScherer · Jun 18, 2020 · 977d051 · 977d051
1 parent ffdda17
commit 977d051
Show file tree

Hide file tree

Showing 36 changed files with 231 additions and 289 deletions.
diff --git a/windows_10.json b/windows_10.json
@@ -1,6 +1,7 @@
 {
   "builders": [
     {
+      "accelerator": "kvm",
       "boot_wait": "6m",
       "communicator": "winrm",
       "cpus": "2",
@@ -17,18 +18,22 @@
         "./scripts/win-updates.ps1"
       ],
       "headless": true,
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": "2048",
-      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-      "type": "qemu",
-      "accelerator": "kvm",
       "output_directory": "windows_10-qemu",
       "qemuargs": [
-        [ "-drive", "file=windows_10-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ],
-        [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ]
+        [
+          "-drive",
+          "file=windows_10-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"
+        ],
+        [
+          "-drive",
+          "file={{ user `virtio_win_iso` }},media=cdrom,index=3"
+        ]
       ],
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "type": "qemu",
       "vm_name": "{{user `vm_name`}}",
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",
@@ -52,8 +57,7 @@
         "./scripts/win-updates.ps1"
       ],
       "guest_additions_mode": "none",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": "2048",
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -85,8 +89,7 @@
       ],
       "guest_os_type": "windows9-64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -124,8 +127,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows10_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -195,9 +197,9 @@
     "iso_url": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
     "restart_timeout": "5m",
     "vhv_enable": "false",
-    "winrm_timeout": "6h",
+    "virtio_win_iso": "~/virtio-win.iso",
     "vm_name": "windows_10",
-    "virtio_win_iso": "~/virtio-win.iso"
+    "winrm_timeout": "6h"
   }
 }
 
diff --git a/windows_10_insider.json b/windows_10_insider.json
@@ -20,8 +20,7 @@
       ],
       "guest_os_type": "windows9-64",
       "headless": false,
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -58,8 +57,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows10_64",
       "headless": false,
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -80,8 +78,7 @@
       "enable_virtualization_extensions": true,
       "generation": 2,
       "guest_additions_mode": "disable",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "secondary_iso_images": [

diff --git a/windows_2008_r2.json b/windows_2008_r2.json
@@ -14,14 +14,13 @@
       ],
       "guest_os_type": "windows7srv-64",
       "headless": true,
-      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:4263be2cf3c59177c45085c0a7bc6ca5",
       "iso_url": "https://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",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "6h",
+      "ssh_username": "vagrant",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -45,14 +44,13 @@
       ],
       "guest_os_type": "Windows2008_64",
       "headless": false,
-      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:4263be2cf3c59177c45085c0a7bc6ca5",
       "iso_url": "https://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",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "6h",
+      "ssh_username": "vagrant",
       "type": "virtualbox-iso"
     }
   ],

diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json
@@ -12,14 +12,13 @@
       ],
       "guest_os_type": "windows7srv-64",
       "headless": true,
-      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:4263be2cf3c59177c45085c0a7bc6ca5",
       "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",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "2h",
+      "ssh_username": "vagrant",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -41,14 +40,13 @@
       ],
       "guest_os_type": "Windows2008_64",
       "headless": true,
-      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:4263be2cf3c59177c45085c0a7bc6ca5",
       "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",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "2h",
+      "ssh_username": "vagrant",
       "type": "virtualbox-iso"
     }
   ],

diff --git a/windows_2012.json b/windows_2012.json
@@ -13,14 +13,13 @@
       ],
       "guest_os_type": "windows8srv-64",
       "headless": true,
-      "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:8503997171f731d9bd1cb0b0edc31f3d",
       "iso_url": "https://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "2h",
+      "ssh_username": "vagrant",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -43,14 +42,13 @@
       ],
       "guest_os_type": "Windows2012_64",
       "headless": true,
-      "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:8503997171f731d9bd1cb0b0edc31f3d",
       "iso_url": "https://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "2h",
+      "ssh_username": "vagrant",
       "type": "virtualbox-iso"
     }
   ],

diff --git a/windows_2012_r2.json b/windows_2012_r2.json
@@ -18,8 +18,7 @@
         "./scripts/win-updates.ps1"
       ],
       "guest_additions_mode": "disable",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
@@ -46,8 +45,7 @@
       ],
       "guest_os_type": "windows8srv-64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -81,8 +79,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2012_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",

diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json
@@ -18,8 +18,7 @@
         "./scripts/win-updates.ps1"
       ],
       "guest_additions_mode": "disable",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
@@ -45,8 +44,7 @@
       ],
       "guest_os_type": "windows8srv-64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -77,8 +75,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2012_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",

diff --git a/windows_2012_r2_hyperv.json b/windows_2012_r2_hyperv.json
@@ -13,14 +13,13 @@
       ],
       "guest_os_type": "windows8srv-64",
       "headless": true,
-      "iso_checksum": "9c9e0d82cb6301a4b88fd2f4c35caf80",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:9c9e0d82cb6301a4b88fd2f4c35caf80",
       "iso_url": "http://care.dlservice.microsoft.com/dl/download/F/7/D/F7DF966B-5C40-4674-9A32-D83D869A3244/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVERHYPERCORE_EN-US-IRM_SHV_X64FRE_EN-US_DV5.ISO",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "6h",
+      "ssh_username": "vagrant",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -43,14 +42,13 @@
       ],
       "guest_os_type": "Windows2012_64",
       "headless": true,
-      "iso_checksum": "9c9e0d82cb6301a4b88fd2f4c35caf80",
-      "iso_checksum_type": "md5",
+      "iso_checksum": "md5:9c9e0d82cb6301a4b88fd2f4c35caf80",
       "iso_url": "http://care.dlservice.microsoft.com/dl/download/F/7/D/F7DF966B-5C40-4674-9A32-D83D869A3244/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVERHYPERCORE_EN-US-IRM_SHV_X64FRE_EN-US_DV5.ISO",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
       "ssh_timeout": "6h",
+      "ssh_username": "vagrant",
       "type": "virtualbox-iso"
     }
   ],

diff --git a/windows_2016.json b/windows_2016.json
@@ -19,8 +19,7 @@
         "./scripts/win-updates.ps1"
       ],
       "guest_additions_mode": "disable",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
@@ -50,8 +49,7 @@
       ],
       "guest_os_type": "windows9srv-64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
@@ -87,8 +85,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2016_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",

diff --git a/windows_2016_ami.json b/windows_2016_ami.json
@@ -19,8 +19,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2016_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",

diff --git a/windows_2016_core.json b/windows_2016_core.json
@@ -16,8 +16,7 @@
         "./scripts/win-updates.ps1"
       ],
       "guest_additions_mode": "disable",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -45,8 +44,7 @@
       ],
       "guest_os_type": "windows9srv-64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
@@ -78,8 +76,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2016_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",

diff --git a/windows_2016_core_ami.json b/windows_2016_core_ami.json
@@ -17,8 +17,7 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2016_64",
       "headless": "{{user `headless`}}",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}",
       "iso_url": "{{user `iso_url`}}",
       "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",