Merge pull request #2642 from oliviertremblay/master

Make TargetPath customizable

builder/parallels/iso/builder.go

@@ -47,6 +47,7 @@ type Config struct {
 	ISOUrls            []string `mapstructure:"iso_urls"`
 	SkipCompaction     bool     `mapstructure:"skip_compaction"`
 	VMName             string   `mapstructure:"vm_name"`
+	TargetPath         string   `mapstructure:"iso_target_path"`
 
 	RawSingleISOUrl string `mapstructure:"iso_url"`
 
@@ -220,6 +221,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Description:  "ISO",
 			ResultKey:    "iso_path",
 			Url:          b.config.ISOUrls,
+			TargetPath:   b.config.TargetPath,
 		},
 		&parallelscommon.StepOutputDir{
 			Force: b.config.PackerForce,

builder/qemu/builder.go

@@ -106,6 +106,7 @@ type Config struct {
 	ShutdownCommand string     `mapstructure:"shutdown_command"`
 	SSHHostPortMin  uint       `mapstructure:"ssh_host_port_min"`
 	SSHHostPortMax  uint       `mapstructure:"ssh_host_port_max"`
+	TargetPath      string     `mapstructure:"iso_target_path"`
 	VNCPortMin      uint       `mapstructure:"vnc_port_min"`
 	VNCPortMax      uint       `mapstructure:"vnc_port_max"`
 	VMName          string     `mapstructure:"vm_name"`
@@ -385,6 +386,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Description:  "ISO",
 			ResultKey:    "iso_path",
 			Url:          b.config.ISOUrls,
+			TargetPath:   b.config.TargetPath,
 		},
 		new(stepPrepareOutputDir),
 		&common.StepCreateFloppy{

builder/virtualbox/iso/builder.go

@@ -47,6 +47,7 @@ type Config struct {
 	ISOChecksumType      string   `mapstructure:"iso_checksum_type"`
 	ISOInterface         string   `mapstructure:"iso_interface"`
 	ISOUrls              []string `mapstructure:"iso_urls"`
+	TargetPath           string   `mapstructure:"iso_target_path"`
 	VMName               string   `mapstructure:"vm_name"`
 
 	RawSingleISOUrl string `mapstructure:"iso_url"`
@@ -229,6 +230,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			ResultKey:    "iso_path",
 			Url:          b.config.ISOUrls,
 			Extension:    "iso",
+			TargetPath:   b.config.TargetPath,
 		},
 		&vboxcommon.StepOutputDir{
 			Force: b.config.PackerForce,

builder/vmware/iso/builder.go

@@ -48,6 +48,7 @@ type Config struct {
 	VMName              string   `mapstructure:"vm_name"`
 	BootCommand         []string `mapstructure:"boot_command"`
 	SkipCompaction      bool     `mapstructure:"skip_compaction"`
+	TargetPath          string   `mapstructure:"iso_target_path"`
 	VMXTemplatePath     string   `mapstructure:"vmx_template_path"`
 	VMXDiskTemplatePath string   `mapstructure:"vmx_disk_template_path"`
 
@@ -256,6 +257,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Description:  "ISO",
 			ResultKey:    "iso_path",
 			Url:          b.config.ISOUrls,
+			TargetPath:   b.config.TargetPath,
 		},
 		&vmwcommon.StepOutputDir{
 			Force: b.config.PackerForce,

website/source/docs/builders/parallels-iso.html.markdown

@@ -138,6 +138,10 @@ builder.
     to force the HTTP server to be on one port, make this minimum and maximum
     port the same. By default the values are 8000 and 9000, respectively.
 
+-   `iso_target_path` (string) - The path where the iso should be saved after
+    download. By default will go in the packer cache, with a hash of the
+    original filename as its name.
+
 -   `iso_urls` (array of strings) - Multiple URLs for the ISO to download.
     Packer will try these in order. If anything goes wrong attempting to
     download or while downloading a single URL, it will move on to the next. All

website/source/docs/builders/qemu.html.markdown

@@ -167,6 +167,10 @@ builder.
     to force the HTTP server to be on one port, make this minimum and maximum
     port the same. By default the values are 8000 and 9000, respectively.
 
+-   `iso_target_path` (string) - The path where the iso should be saved after
+    download. By default will go in the packer cache, with a hash of the
+    original filename as its name.
+      
 -   `iso_urls` (array of strings) - Multiple URLs for the ISO to download.
     Packer will try these in order. If anything goes wrong attempting to
     download or while downloading a single URL, it will move on to the next. All

website/source/docs/builders/virtualbox-iso.html.markdown

@@ -170,6 +170,10 @@ builder.
     to, defaults to "ide". When set to "sata", the drive is attached to an AHCI
     SATA controller.
 
+-   `iso_target_path` (string) - The path where the iso should be saved after
+    download. By default will go in the packer cache, with a hash of the
+    original filename as its name.
+
 -   `iso_urls` (array of strings) - Multiple URLs for the ISO to download.
     Packer will try these in order. If anything goes wrong attempting to
     download or while downloading a single URL, it will move on to the next. All

website/source/docs/builders/vmware-iso.html.markdown

@@ -148,6 +148,10 @@ builder.
     to force the HTTP server to be on one port, make this minimum and maximum
     port the same. By default the values are 8000 and 9000, respectively.
 
+-   `iso_target_path` (string) - The path where the iso should be saved after
+    download. By default will go in the packer cache, with a hash of the
+    original filename as its name.
+
 -   `iso_urls` (array of strings) - Multiple URLs for the ISO to download.
     Packer will try these in order. If anything goes wrong attempting to
     download or while downloading a single URL, it will move on to the next. All