Added the vm_suffix user variable, and changed the order of all of th…

…e user variables in all of the templates so that they're grouped together.
boxcutter · Jan 13, 2020 · e3f595c · e3f595c
1 parent dd9ee40
commit e3f595c
Show file tree

Hide file tree

Showing 87 changed files with 870 additions and 783 deletions.
diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json
@@ -163,7 +163,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win10x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win10x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl"
     }
@@ -197,19 +197,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win10x64-enterprise-cygwin",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win10x64-enterprise-cygwin",
-    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json
@@ -159,7 +159,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win10x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win10x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl"
     }
@@ -193,19 +193,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win10x64-enterprise-ssh",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win10x64-enterprise-ssh",
-    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json
@@ -159,7 +159,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win10x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win10x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise.tpl"
     }
@@ -185,19 +185,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win10x64-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win10x64-enterprise",
-    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json
@@ -163,7 +163,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win10x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win10x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl"
     }
@@ -197,19 +197,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win10x86-enterprise-cygwin",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win10x86-enterprise-cygwin",
-    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso",
+    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json
@@ -159,7 +159,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win10x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win10x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl"
     }
@@ -193,19 +193,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win10x86-enterprise-ssh",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win10x86-enterprise-ssh",
-    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso",
+    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json
@@ -159,7 +159,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win10x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win10x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise.tpl"
     }
@@ -185,19 +185,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win10x86-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win10x86-enterprise",
-    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso",
+    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json
@@ -134,7 +134,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win2008r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win2008r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl"
     }
@@ -168,19 +168,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win2008r2-datacenter-cygwin",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win2008r2-datacenter-cygwin",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "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": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json
@@ -134,7 +134,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl"
     }
@@ -168,19 +168,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win2008r2-datacenter-ssh",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win2008r2-datacenter-ssh",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "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": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json
@@ -138,7 +138,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter.tpl"
     }
@@ -164,19 +164,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win2008r2-datacenter",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win2008r2-datacenter",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "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": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }

diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json
@@ -134,7 +134,7 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "{{ user `box_prefix` }}{{.Provider}}/eval-win2008r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{ user `box_directory` }}{{.Provider}}/eval-win2008r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
       "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl"
     }
@@ -168,19 +168,20 @@
     }
   ],
   "variables": {
-    "cpus": "2",
-    "memory": "2048",
-    "guest_additions_url": "",
+    "vm_name": "eval-win2008r2-standard-cygwin",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
-    "hw_version": "7",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "box_prefix": "box/",
-    "vm_name": "eval-win2008r2-standard-cygwin",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "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": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }