From 2aaec946b3b7990c29d94583940d211415ef0799 Mon Sep 17 00:00:00 2001 From: mheidenr Date: Fri, 29 Nov 2013 17:33:26 +0100 Subject: [PATCH 1/3] fix post-processor vsphere --- post-processor/vsphere/post-processor.go | 42 ++++++++++++++++-------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index 5508638fd..113d6b3a0 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -17,11 +17,13 @@ type Config struct { common.PackerConfig `mapstructure:",squash"` Insecure bool `mapstructure:"insecure"` + Cluster string `mapstructure:"cluster"` Datacenter string `mapstructure:"datacenter"` Datastore string `mapstructure:"datastore"` + Debug bool `mapstructure:"debug"` Host string `mapstructure:"host"` Password string `mapstructure:"password"` - PathToResourcePool string `mapstructure:"path_to_resource_pool"` + ResourcePool string `mapstructure:"resource_pool"` Username string `mapstructure:"username"` VMFolder string `mapstructure:"vm_folder"` VMName string `mapstructure:"vm_name"` @@ -37,7 +39,7 @@ func (p *PostProcessor) Configure(raws ...interface{}) error { if err != nil { return err } - + tpl, err := packer.NewConfigTemplate() if err != nil { return err @@ -46,22 +48,28 @@ func (p *PostProcessor) Configure(raws ...interface{}) error { // Accumulate any errors errs := new(packer.MultiError) - + + if err := tpl.Validate(p.config.VMName); err != nil { + errs = packer.MultiErrorAppend( + errs, fmt.Errorf("Error parsing output template: %s", err)) + } + if _, err := exec.LookPath("ovftool"); err != nil { errs = packer.MultiErrorAppend( errs, fmt.Errorf("ovftool not found: %s", err)) } validates := map[string]*string{ - "datacenter": &p.config.Datacenter, - "datastore": &p.config.Datastore, - "host": &p.config.Host, - "vm_network": &p.config.VMNetwork, - "password": &p.config.Password, - "path_to_resource_pool": &p.config.PathToResourcePool, - "username": &p.config.Username, - "vm_folder": &p.config.VMFolder, - "vm_name": &p.config.VMName, + "cluster": &p.config.Cluster, + "datacenter": &p.config.Datacenter, + "datastore": &p.config.Datastore, + "host": &p.config.Host, + "vm_network": &p.config.VMNetwork, + "password": &p.config.Password, + "resource_pool": &p.config.ResourcePool, + "username": &p.config.Username, + "vm_folder": &p.config.VMFolder, + "vm_name": &p.config.VMName, } for n := range validates { @@ -104,12 +112,18 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac fmt.Sprintf("--datastore=%s", p.config.Datastore), fmt.Sprintf("--network=%s", p.config.VMNetwork), fmt.Sprintf("--vmFolder=%s", p.config.VMFolder), - fmt.Sprintf("vi://%s:%s@%s/%s/%s", + fmt.Sprintf("%s", vmx), + fmt.Sprintf("vi://%s:%s@%s/%s/host/%s/Resources/%s", p.config.Username, p.config.Password, p.config.Host, p.config.Datacenter, - p.config.PathToResourcePool), + p.config.Cluster, + p.config.ResourcePool), + } + + if p.config.Debug { + ui.Message(fmt.Sprintf("DEBUG: %s", args)) } var out bytes.Buffer From 129749a2e4293e6d70f8eec86669bcbabd6c41f0 Mon Sep 17 00:00:00 2001 From: mheidenr Date: Mon, 2 Dec 2013 12:39:52 +0100 Subject: [PATCH 2/3] post-processor-vsphere: user variables for vm_name, username, password --- post-processor/vsphere/post-processor.go | 38 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index 113d6b3a0..1f2576208 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -28,6 +28,8 @@ type Config struct { VMFolder string `mapstructure:"vm_folder"` VMName string `mapstructure:"vm_name"` VMNetwork string `mapstructure:"vm_network"` + + tpl *packer.ConfigTemplate } type PostProcessor struct { @@ -39,21 +41,16 @@ func (p *PostProcessor) Configure(raws ...interface{}) error { if err != nil { return err } - - tpl, err := packer.NewConfigTemplate() + + p.config.tpl, err = packer.NewConfigTemplate() if err != nil { return err } - tpl.UserVars = p.config.PackerUserVars + p.config.tpl.UserVars = p.config.PackerUserVars // Accumulate any errors errs := new(packer.MultiError) - - if err := tpl.Validate(p.config.VMName); err != nil { - errs = packer.MultiErrorAppend( - errs, fmt.Errorf("Error parsing output template: %s", err)) - } - + if _, err := exec.LookPath("ovftool"); err != nil { errs = packer.MultiErrorAppend( errs, fmt.Errorf("ovftool not found: %s", err)) @@ -103,25 +100,40 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac return nil, false, fmt.Errorf("VMX file not found") } + vm_name, err := p.config.tpl.Process(p.config.VMName, p.config.PackerUserVars) + if err != nil { + return nil, false, fmt.Errorf("Failed: %s", err) + } + + username, err := p.config.tpl.Process(p.config.Username, p.config.PackerUserVars) + if err != nil { + return nil, false, fmt.Errorf("Failed: %s", err) + } + + password, err := p.config.tpl.Process(p.config.Password, p.config.PackerUserVars) + if err != nil { + return nil, false, fmt.Errorf("Failed: %s", err) + } + ui.Message(fmt.Sprintf("Uploading %s to vSphere", vmx)) args := []string{ fmt.Sprintf("--noSSLVerify=%t", p.config.Insecure), "--acceptAllEulas", - fmt.Sprintf("--name=%s", p.config.VMName), + fmt.Sprintf("--name=%s", vm_name), fmt.Sprintf("--datastore=%s", p.config.Datastore), fmt.Sprintf("--network=%s", p.config.VMNetwork), fmt.Sprintf("--vmFolder=%s", p.config.VMFolder), fmt.Sprintf("%s", vmx), fmt.Sprintf("vi://%s:%s@%s/%s/host/%s/Resources/%s", - p.config.Username, - p.config.Password, + username, + password, p.config.Host, p.config.Datacenter, p.config.Cluster, p.config.ResourcePool), } - + if p.config.Debug { ui.Message(fmt.Sprintf("DEBUG: %s", args)) } From 9df6b8f0c84b3f762a47aed592ad340aad16aaa9 Mon Sep 17 00:00:00 2001 From: mheidenr Date: Mon, 2 Dec 2013 13:53:13 +0100 Subject: [PATCH 3/3] post-processor-vsphere: user variables for datastore --- post-processor/vsphere/post-processor.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index 1f2576208..f624e087a 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -100,6 +100,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac return nil, false, fmt.Errorf("VMX file not found") } + // Get user variables from template vm_name, err := p.config.tpl.Process(p.config.VMName, p.config.PackerUserVars) if err != nil { return nil, false, fmt.Errorf("Failed: %s", err) @@ -115,13 +116,18 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac return nil, false, fmt.Errorf("Failed: %s", err) } + datastore, err := p.config.tpl.Process(p.config.Datastore, p.config.PackerUserVars) + if err != nil { + return nil, false, fmt.Errorf("Failed: %s", err) + } + ui.Message(fmt.Sprintf("Uploading %s to vSphere", vmx)) args := []string{ fmt.Sprintf("--noSSLVerify=%t", p.config.Insecure), "--acceptAllEulas", fmt.Sprintf("--name=%s", vm_name), - fmt.Sprintf("--datastore=%s", p.config.Datastore), + fmt.Sprintf("--datastore=%s", datastore), fmt.Sprintf("--network=%s", p.config.VMNetwork), fmt.Sprintf("--vmFolder=%s", p.config.VMFolder), fmt.Sprintf("%s", vmx),