updated how vmx entries are handled
This commit is contained in:
parent
f765d57009
commit
aa954c9406
|
@ -5,7 +5,6 @@ import (
|
|||
"io/ioutil"
|
||||
"log"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/mitchellh/multistep"
|
||||
"github.com/mitchellh/packer/packer"
|
||||
|
@ -53,7 +52,6 @@ func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
|
|||
// Set custom data
|
||||
for k, v := range s.CustomData {
|
||||
log.Printf("Setting VMX: '%s' = '%s'", k, v)
|
||||
k = strings.ToLower(k)
|
||||
vmxData[k] = v
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ import (
|
|||
func ParseVMX(contents string) 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") {
|
||||
matches := lineRe.FindStringSubmatch(line)
|
||||
|
@ -25,8 +25,7 @@ func ParseVMX(contents string) map[string]string {
|
|||
continue
|
||||
}
|
||||
|
||||
key := strings.ToLower(matches[1])
|
||||
results[key] = matches[2]
|
||||
results[matches[1]] = matches[2]
|
||||
}
|
||||
|
||||
return results
|
||||
|
@ -43,9 +42,22 @@ func EncodeVMX(contents map[string]string) string {
|
|||
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)
|
||||
for _, k := range keys {
|
||||
buf.WriteString(fmt.Sprintf("%s = \"%s\"\n", k, contents[k]))
|
||||
pat := "%s = \"%s\"\n"
|
||||
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()
|
||||
|
|
Loading…
Reference in New Issue