Merge pull request #195 from AtaxyaNetwork/iso-name

Fix iso_name + don't destroy iso when using iso_name

Author: nathanael-h

builder/xenserver/common/step_upload_vdi.go

@@ -16,6 +16,7 @@ type StepUploadVdi struct {
 	VdiNameFunc   func() string
 	ImagePathFunc func() string
 	VdiUuidKey    string
+	PreserveVdi   bool
 }
 
 func (self *StepUploadVdi) uploadVdi(ctx context.Context, state multistep.StateBag) multistep.StepAction {
@@ -105,7 +106,7 @@ func (self *StepUploadVdi) Cleanup(state multistep.StateBag) {
 
 	vdiName := self.VdiNameFunc()
 
-	if config.ShouldKeepVM(state) {
+	if config.ShouldKeepVM(state) || self.PreserveVdi {
 		return
 	}
 

builder/xenserver/iso/builder.go

@@ -254,6 +254,9 @@ func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (p
 		&xscommon.StepFindOrUploadVdi{
 			xscommon.StepUploadVdi{
 				VdiNameFunc: func() string {
+					if self.config.ISOName != "" {
+						return self.config.ISOName
+					}
 					if len(self.config.ISOUrls) > 0 {
 						return path.Base(self.config.ISOUrls[0])
 					}
@@ -265,7 +268,8 @@ func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (p
 					}
 					return ""
 				},
-				VdiUuidKey: "iso_vdi_uuid",
+				VdiUuidKey:  "iso_vdi_uuid",
+				PreserveVdi: self.config.ISOName != "",
 			},
 		},
 		&xscommon.StepFindVdi{