Changes to the export process have made 'inline' build of disks redundant

PR #5631 introduced code to build/create disks directly in the output
directory if `skip_export` was set in an attempt to optimise the build
process. These are no longer required.
This commit is contained in:
DanHam 2018-07-07 22:52:02 +01:00
parent 35b4e87c42
commit d5d82c32b2
No known key found for this signature in database
GPG Key ID: 58E79AEDD6AA987E
2 changed files with 0 additions and 9 deletions

View File

@ -32,8 +32,6 @@ type StepCreateVM struct {
AdditionalDiskSize []uint
DifferencingDisk bool
MacAddress string
SkipExport bool
OutputDir string
FixedVHD bool
}
@ -59,11 +57,6 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste
vhdPath := state.Get("packerVhdTempDir").(string)
// inline vhd path if export is skipped
if s.SkipExport {
vhdPath = filepath.Join(s.OutputDir, "Virtual Hard Disks")
}
// convert the MB to bytes
ramSize := int64(s.RamSize * 1024 * 1024)
diskSize := int64(s.DiskSize * 1024 * 1024)

View File

@ -399,8 +399,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
EnableVirtualizationExtensions: b.config.EnableVirtualizationExtensions,
AdditionalDiskSize: b.config.AdditionalDiskSize,
DifferencingDisk: b.config.DifferencingDisk,
SkipExport: b.config.SkipExport,
OutputDir: b.config.OutputDir,
MacAddress: b.config.MacAddress,
FixedVHD: b.config.FixedVHD,
},