remove iso_checksum_type to react to hashicorp/packer#8437

nuggie · Jun 18, 2020 · 9d9373f · 9d9373f
1 parent 4877246
commit 9d9373f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 22 deletions.
diff --git a/ubuntu.json b/ubuntu.json
@@ -26,8 +26,7 @@
       "guest_os_type": "{{ user `vmware_guest_os_type` }}",
       "headless": "{{ user `headless` }}",
       "http_directory": "http",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "{{ user `iso_checksum_type` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",      
       "iso_urls": [
         "{{ user `iso_path` }}/{{ user `iso_name` }}",
         "{{ user `iso_url` }}"
@@ -73,8 +72,7 @@
       "guest_os_type": "{{ user `virtualbox_guest_os_type` }}",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "{{ user `iso_checksum_type` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",      
       "iso_urls": [
         "{{ user `iso_path` }}/{{ user `iso_name` }}",
         "{{ user `iso_url` }}"
@@ -124,8 +122,7 @@
       ],
       "guest_os_type": "{{ user `parallels_guest_os_type` }}",
       "http_directory": "http",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "{{ user `iso_checksum_type` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",      
       "iso_urls": [
         "{{ user `iso_path` }}/{{ user `iso_name` }}",
         "{{ user `iso_url` }}"
@@ -203,8 +200,7 @@
     "http_proxy": "{{env `http_proxy`}}",
     "https_proxy": "{{env `https_proxy`}}",
     "install_vagrant_key": "true",
-    "iso_checksum": "a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8",
-    "iso_checksum_type": "sha256",
+    "iso_checksum": "sha256:a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8",    
     "iso_name": "ubuntu-18.04.1-server-amd64.iso",
     "iso_path": "/Volumes/Storage/software/ubuntu",
     "iso_url": "http://cdimage.ubuntu.com/ubuntu/releases/18.04/release/ubuntu-18.04.1-server-amd64.iso",

diff --git a/ubuntu1404-desktop.json b/ubuntu1404-desktop.json
@@ -4,8 +4,7 @@
   "desktop": "true",
   "cpus": "1",
   "disk_size": "130048",
-  "iso_checksum": "5e567024c385cc8f90c83d6763c6e4f1cd5deb6f",
-  "iso_checksum_type": "sha1",
+  "iso_checksum": "sha1:5e567024c385cc8f90c83d6763c6e4f1cd5deb6f",  
   "iso_name": "ubuntu-14.04.5-server-amd64.iso",
   "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso",
   "memory": "1024",

diff --git a/ubuntu1404.json b/ubuntu1404.json
@@ -3,8 +3,7 @@
   "vm_name": "ubuntu1404",
   "cpus": "1",
   "disk_size": "65536",
-  "iso_checksum": "13bfe163ca8ad8a6e5676b0460ca60d03387ec24",
-  "iso_checksum_type": "sha1",
+  "iso_checksum": "sha1:13bfe163ca8ad8a6e5676b0460ca60d03387ec24",  
   "iso_name": "ubuntu-14.04.6-server-amd64.iso",
   "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.6-server-amd64.iso",
   "memory": "512",

diff --git a/ubuntu1604-desktop.json b/ubuntu1604-desktop.json
@@ -5,8 +5,7 @@
   "locale": "en_US.UTF-8",
   "cpus": "1",
   "disk_size": "130048",
-  "iso_checksum": "c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8",
-  "iso_checksum_type": "sha256",
+  "iso_checksum": "sha256:c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8",  
   "iso_name": "ubuntu-16.04.5-server-amd64.iso",
   "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso",
   "memory": "1024",

diff --git a/ubuntu1604.json b/ubuntu1604.json
@@ -3,8 +3,7 @@
   "vm_name": "ubuntu1604",
   "cpus": "1",
   "disk_size": "65536",
-  "iso_checksum": "c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8",
-  "iso_checksum_type": "sha256",
+  "iso_checksum": "sha256:c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8",  
   "iso_name": "ubuntu-16.04.5-server-amd64.iso",
   "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso",
   "memory": "512",

diff --git a/ubuntu1804-desktop.json b/ubuntu1804-desktop.json
@@ -5,8 +5,7 @@
   "locale": "en_US.UTF-8",
   "cpus": "1",
   "disk_size": "130048",
-  "iso_checksum": "a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8",
-  "iso_checksum_type": "sha256",
+  "iso_checksum": "sha256:a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8",  
   "iso_name": "ubuntu-18.04.1-server-amd64.iso",
   "iso_url": "http://old-releases.ubuntu.com/releases/bionic/ubuntu-18.04.1-server-amd64.iso",
   "memory": "1024",

diff --git a/ubuntu1804.json b/ubuntu1804.json
@@ -3,8 +3,7 @@
   "vm_name": "ubuntu1804",
   "cpus": "1",
   "disk_size": "65536",
-  "iso_checksum": "e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b",
-  "iso_checksum_type": "sha256",
+  "iso_checksum": "sha256:e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b",  
   "iso_name": "ubuntu-18.04.4-server-amd64.iso",
   "iso_url": "http://cdimage.ubuntu.com/ubuntu/releases/18.04/release/ubuntu-18.04.4-server-amd64.iso",
   "memory": "512",

diff --git a/ubuntu2004.json b/ubuntu2004.json
@@ -3,8 +3,7 @@
   "vm_name": "ubuntu2004",
   "cpus": "1",
   "disk_size": "65536",
-  "iso_checksum": "36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73",
-  "iso_checksum_type": "sha256",
+  "iso_checksum": "sha256:36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73",  
   "iso_name": "ubuntu-20.04-legacy-server-amd64.iso",
   "iso_url": "http://cdimage.ubuntu.com/ubuntu-legacy-server/releases/20.04/release/ubuntu-20.04-legacy-server-amd64.iso",
   "memory": "512",