diff --git a/builder/virtualbox/common/vboxmanage_config.go b/builder/virtualbox/common/vboxmanage_config.go index b243400a1..1670aee0d 100644 --- a/builder/virtualbox/common/vboxmanage_config.go +++ b/builder/virtualbox/common/vboxmanage_config.go @@ -1,10 +1,6 @@ package common import ( - "fmt" - "strconv" - - "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/template/interpolate" ) @@ -15,25 +11,7 @@ type VBoxManageConfig struct { func (c *VBoxManageConfig) Prepare(ctx *interpolate.Context) []error { if c.VBoxManage == nil { c.VBoxManage = make([][]string, 0) - return nil - } - - var errs []error - var err error - var desiredMem uint64 - - for _, cmd := range c.VBoxManage { - if cmd[2] == "--memory" { - desiredMem, err = strconv.ParseUint(cmd[3], 10, 64) - if err != nil { - errs = append(errs, fmt.Errorf("Error parsing string: %s", err)) - } - } - } - - if err = common.AvailableMem(desiredMem); err != nil { - errs = append(errs, fmt.Errorf("Unavailable Resources: %s", err)) } - return errs + return nil } diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index c30fd83ee..b8b08959a 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -152,12 +152,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { b.config.GuestAdditionsSHA256 = strings.ToLower(b.config.GuestAdditionsSHA256) } - // Determine if DiskSize is able to be allocated - if err = common.AvailableDisk(uint64(b.config.DiskSize)); err != nil { - errs = packer.MultiErrorAppend(errs, - fmt.Errorf("Unavailable Resources: %s", err)) - } - // Warnings if b.config.ShutdownCommand == "" { warnings = append(warnings, diff --git a/builder/vmware/common/vmx_config.go b/builder/vmware/common/vmx_config.go index 6a707abe0..aac16d1e0 100644 --- a/builder/vmware/common/vmx_config.go +++ b/builder/vmware/common/vmx_config.go @@ -1,10 +1,6 @@ package common import ( - "fmt" - "strconv" - - "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/template/interpolate" ) @@ -14,22 +10,5 @@ type VMXConfig struct { } func (c *VMXConfig) Prepare(ctx *interpolate.Context) []error { - var errs []error - var err error - var desiredMem uint64 - - for k, v := range c.VMXData { - if k == "memsize" { - desiredMem, err = strconv.ParseUint(v, 10, 64) - if err != nil { - errs = append(errs, fmt.Errorf("Error parsing string: %s", err)) - } - } - } - - if err = common.AvailableMem(desiredMem); err != nil { - errs = append(errs, fmt.Errorf("Unavailable Resources: %s", err)) - } - - return errs + return nil } diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index d62c0eff7..95395c73c 100755 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -171,12 +171,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { } } - // Determine if DiskSize is able to be allocated - if err = common.AvailableDisk(uint64(b.config.DiskSize)); err != nil { - errs = packer.MultiErrorAppend(errs, - fmt.Errorf("Unavailable Resources: %s", err)) - } - // Warnings if b.config.ShutdownCommand == "" { warnings = append(warnings, diff --git a/common/resources_linux.go b/common/resources_linux.go deleted file mode 100644 index fd9b0cf16..000000000 --- a/common/resources_linux.go +++ /dev/null @@ -1,37 +0,0 @@ -package common - -import ( - "fmt" - "os" - - sigar "github.com/cloudfoundry/gosigar" -) - -func AvailableMem(desired uint64) error { - free := freeMem() - if desired > free { - return fmt.Errorf("RAM - Requested - %dMB - Available %dMB", desired, free) - } - return nil -} - -func freeMem() uint64 { - mem := sigar.Mem{} - mem.Get() - return (mem.Free / 1024 / 1024) -} - -func AvailableDisk(desired uint64) error { - free := freeDisk() - if desired > free { - return fmt.Errorf("Disk - Requested - %dMB - Available %dMB", desired, free) - } - return nil -} - -func freeDisk() uint64 { - disk := sigar.FileSystemUsage{} - workingDirectory, _ := os.Getwd() - disk.Get(workingDirectory) - return (disk.Avail / 1024) -} diff --git a/common/resources_universal.go b/common/resources_universal.go deleted file mode 100644 index 3ecc7d2e8..000000000 --- a/common/resources_universal.go +++ /dev/null @@ -1,11 +0,0 @@ -// +build !linux - -package common - -func AvailableMem(desired uint64) error { - return nil -} - -func AvailableDisk(desired uint64) error { - return nil -}