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

Merge branch 'master' of https://github.com/mitchellh/packer

This commit is contained in:
Chris Bednarski 2015-08-10 18:05:26 -07:00
parent 27e7a02e62 b81bd74a2d
commit c3d6366c3c
6 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/vmware/common/ssh.go
View File

@ -39,7 +39,7 @@ func CommHost(config *SSHConfig) func(multistep.StateBag) (string, error) {
var ok bool var ok bool
macAddress := "" macAddress := ""
if macAddress, ok = vmxData["ethernet0.address"]; !ok || macAddress == "" { if macAddress, ok = vmxData["ethernet0.address"]; !ok || macAddress == "" {
if macAddress, ok = vmxData["ethernet0.generatedAddress"]; !ok || macAddress == "" { if macAddress, ok = vmxData["ethernet0.generatedaddress"]; !ok || macAddress == "" {
return "", errors.New("couldn't find MAC address in VMX") return "", errors.New("couldn't find MAC address in VMX")
} }
} }

9
builder/vmware/common/step_clean_vmx.go
View File

@ -2,11 +2,12 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
"log" "log"
"regexp" "regexp"
"strings" "strings"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
) )
// This step cleans up the VMX by removing or changing this prior to // This step cleans up the VMX by removing or changing this prior to
@ -51,8 +52,8 @@ func (s StepCleanVMX) Run(state multistep.StateBag) multistep.StepAction {
ui.Message("Detaching ISO from CD-ROM device...") ui.Message("Detaching ISO from CD-ROM device...")
vmxData[ide+"deviceType"] = "cdrom-raw" vmxData[ide+"devicetype"] = "cdrom-raw"
vmxData[ide+"fileName"] = "auto detect" vmxData[ide+"filename"] = "auto detect"
} }
ui.Message("Disabling VNC server...") ui.Message("Disabling VNC server...")

18
builder/vmware/common/step_clean_vmx_test.go
View File

@ -61,8 +61,8 @@ func TestStepCleanVMX_floppyPath(t *testing.T) {
Value string Value string
}{ }{
{"floppy0.present", "FALSE"}, {"floppy0.present", "FALSE"},
{"floppy0.fileType", ""}, {"floppy0.filetype", ""},
{"floppy0.fileName", ""}, {"floppy0.filename", ""},
} }
for _, tc := range cases { for _, tc := range cases {
@ -109,9 +109,9 @@ func TestStepCleanVMX_isoPath(t *testing.T) {
Key string Key string
Value string Value string
}{ }{
{"ide0:0.fileName", "auto detect"}, {"ide0:0.filename", "auto detect"},
{"ide0:0.deviceType", "cdrom-raw"}, {"ide0:0.devicetype", "cdrom-raw"},
{"ide0:1.fileName", "bar"}, {"ide0:1.filename", "bar"},
{"foo", "bar"}, {"foo", "bar"},
} }
@ -130,12 +130,12 @@ func TestStepCleanVMX_isoPath(t *testing.T) {
const testVMXFloppyPath = ` const testVMXFloppyPath = `
floppy0.present = "TRUE" floppy0.present = "TRUE"
floppy0.fileType = "file" floppy0.filetype = "file"
` `
const testVMXISOPath = ` const testVMXISOPath = `
ide0:0.deviceType = "cdrom-image" ide0:0.devicetype = "cdrom-image"
ide0:0.fileName = "foo" ide0:0.filename = "foo"
ide0:1.fileName = "bar" ide0:1.filename = "bar"
foo = "bar" foo = "bar"
` `

2
builder/vmware/common/step_configure_vmx.go
View File

@ -5,6 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"regexp" "regexp"
"strings"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
@ -52,6 +53,7 @@ func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
// Set custom data // Set custom data
for k, v := range s.CustomData { for k, v := range s.CustomData {
log.Printf("Setting VMX: '%s' = '%s'", k, v) log.Printf("Setting VMX: '%s' = '%s'", k, v)
k = strings.ToLower(k)
vmxData[k] = v vmxData[k] = v
} }

20
builder/vmware/common/vmx.go
View File

@ -17,7 +17,7 @@ import (
func ParseVMX(contents string) map[string]string { func ParseVMX(contents string) map[string]string {
results := make(map[string]string) results := make(map[string]string)
lineRe := regexp.MustCompile(`^(.+?)\s*=\s*"?(.*?)"?\s*$`) lineRe := regexp.MustCompile(`^(.+?)\s*=\s*"(.*?)"\s*$`)
for _, line := range strings.Split(contents, "\n") { for _, line := range strings.Split(contents, "\n") {
matches := lineRe.FindStringSubmatch(line) matches := lineRe.FindStringSubmatch(line)
@ -25,7 +25,8 @@ func ParseVMX(contents string) map[string]string {
continue continue
} }
results[matches[1]] = matches[2] key := strings.ToLower(matches[1])
results[key] = matches[2]
} }
return results return results
@ -42,22 +43,9 @@ func EncodeVMX(contents map[string]string) string {
i++ i++
} }
// a list of VMX key fragments that should not be wrapped in quotes,
// fragments because multiple disks can use the virtualSSD suffix
noQuotes := []string {
"virtualSSD",
}
sort.Strings(keys) sort.Strings(keys)
for _, k := range keys { for _, k := range keys {
pat := "%s = \"%s\"\n" buf.WriteString(fmt.Sprintf("%s = \"%s\"\n", k, contents[k]))
for _, q := range noQuotes {
if strings.Contains(k, q) {
pat = "%s = %s\n"
break;
}
}
buf.WriteString(fmt.Sprintf(pat, k, contents[k]))
} }
return buf.String() return buf.String()

12
builder/vmware/vmx/step_clone_vmx.go
View File

@ -38,14 +38,14 @@ func (s *StepCloneVMX) Run(state multistep.StateBag) multistep.StepAction {
} }
var diskName string var diskName string
if _, ok := vmxData["scsi0:0.fileName"]; ok { if _, ok := vmxData["scsi0:0.filename"]; ok {
diskName = vmxData["scsi0:0.fileName"] diskName = vmxData["scsi0:0.filename"]
} }
if _, ok := vmxData["sata0:0.fileName"]; ok { if _, ok := vmxData["sata0:0.filename"]; ok {
diskName = vmxData["sata0:0.fileName"] diskName = vmxData["sata0:0.filename"]
} }
if _, ok := vmxData["ide0:0.fileName"]; ok { if _, ok := vmxData["ide0:0.filename"]; ok {
diskName = vmxData["ide0:0.fileName"] diskName = vmxData["ide0:0.filename"]
} }
if diskName == "" { if diskName == "" {
err := fmt.Errorf("Root disk filename could not be found!") err := fmt.Errorf("Root disk filename could not be found!")