iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove inconsistent "_mb" from ram size

This commit is contained in:
Taliesin Sisson 2016-11-06 14:07:46 +00:00
parent 0515487062
commit 3c1df5a791
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/hyperv/common/step_create_vm.go
View File

@ -18,7 +18,7 @@ import (
type StepCreateVM struct {
VMName string
SwitchName string
RamSizeMB uint
RamSize uint
DiskSize uint
Generation uint
Cpu uint
@ -36,10 +36,10 @@ func (s *StepCreateVM) Run(state multistep.StateBag) multistep.StepAction {
path := state.Get("packerTempDir").(string)
// convert the MB to bytes
ram := int64(s.RamSizeMB * 1024 * 1024)
ramSize := int64(s.RamSize * 1024 * 1024)
diskSize := int64(s.DiskSize * 1024 * 1024)
err := driver.CreateVirtualMachine(s.VMName, path, ram, diskSize, s.SwitchName, s.Generation)
err := driver.CreateVirtualMachine(s.VMName, path, ramSize, diskSize, s.SwitchName, s.Generation)
if err != nil {
err := fmt.Errorf("Error creating virtual machine: %s", err)
state.Put("error", err)

22
builder/hyperv/iso/builder.go
View File

@ -61,7 +61,7 @@ type Config struct {
DiskSize uint `mapstructure:"disk_size"`
// The size, in megabytes, of the computer memory in the VM.
// By default, this is 1024 (about 1 GB).
RamSizeMB uint `mapstructure:"ram_size_mb"`
RamSize uint `mapstructure:"ram_size"`
// A list of files to place onto a floppy disk that is attached when the
// VM is booted. This is most useful for unattended Windows installs,
// which look for an Autounattend.xml file on removable media. By default,
@ -261,7 +261,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
warnings = appendWarnings(warnings, warning)
}
if b.config.RamSizeMB < MinNestedVirtualizationRamSize {
if b.config.RamSize < MinNestedVirtualizationRamSize {
warning = fmt.Sprintf("For nested virtualization, when virtualization extension is enabled, there should be 4GB or more memory set for the vm, otherwise Hyper-V may fail to start any nested VMs.")
warnings = appendWarnings(warnings, warning)
}
@ -328,7 +328,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&hypervcommon.StepCreateVM{
VMName: b.config.VMName,
SwitchName: b.config.SwitchName,
RamSizeMB: b.config.RamSizeMB,
RamSize: b.config.RamSize,
DiskSize: b.config.DiskSize,
Generation: b.config.Generation,
Cpu: b.config.Cpu,
@ -477,16 +477,16 @@ func (b *Builder) checkDiskSize() error {
}
func (b *Builder) checkRamSize() error {
if b.config.RamSizeMB == 0 {
b.config.RamSizeMB = DefaultRamSize
if b.config.RamSize == 0 {
b.config.RamSize = DefaultRamSize
}
log.Println(fmt.Sprintf("%s: %v", "RamSize", b.config.RamSizeMB))
log.Println(fmt.Sprintf("%s: %v", "RamSize", b.config.RamSize))
if b.config.RamSizeMB < MinRamSize {
return fmt.Errorf("ram_size_mb: Virtual machine requires memory size >= %v MB, but defined: %v", MinRamSize, b.config.RamSizeMB)
} else if b.config.RamSizeMB > MaxRamSize {
return fmt.Errorf("ram_size_mb: Virtual machine requires memory size <= %v MB, but defined: %v", MaxRamSize, b.config.RamSizeMB)
if b.config.RamSize < MinRamSize {
return fmt.Errorf("ram_size_mb: Virtual machine requires memory size >= %v MB, but defined: %v", MinRamSize, b.config.RamSize)
} else if b.config.RamSize > MaxRamSize {
return fmt.Errorf("ram_size_mb: Virtual machine requires memory size <= %v MB, but defined: %v", MaxRamSize, b.config.RamSize)
}
return nil
@ -498,7 +498,7 @@ func (b *Builder) checkHostAvailableMemory() string {
if powershellAvailable {
freeMB := powershell.GetHostAvailableMemory()
if (freeMB - float64(b.config.RamSizeMB)) < LowRam {
if (freeMB - float64(b.config.RamSize)) < LowRam {
return fmt.Sprintf("Hyper-V might fail to create a VM if there is not enough free memory in the system.")
}
}

4
website/source/docs/builders/hyperv-iso.html.markdown
View File

@ -358,7 +358,7 @@ Packer config:
"winrm_password": "vagrant",
"winrm_timeout" : "4h",
"shutdown_command": "f:\\run-sysprep.cmd",
"ram_size_mb": 4096,
"ram_size": 4096,
"cpu": 4,
"generation": 2,
"switch_name":"LAN",
@ -886,7 +886,7 @@ Packer config:
"initrd=/install/initrd.gz -- <enter>"
],
"shutdown_command": "echo 'vagrant' | sudo -S -E shutdown -P now",
"ram_size_mb": 4096,
"ram_size": 4096,
"cpu": 4,
"generation": 1,
"switch_name":"LAN"