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

Merge pull request #8064 from mjrider/issue-8060 

post-processor/vsphere: removed redundant whitelist check for builders as the PP will check for an ova, vmx or ovf file
This commit is contained in:
Adrien Delorme 2019-09-05 10:34:04 +02:00 committed by GitHub
parent 2f0968fbbd 3c69a938c5
commit 058fa2116d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
post-processor/vsphere/post-processor.go
View File

@ -19,11 +19,6 @@ import (
"github.com/hashicorp/packer/template/interpolate"
)
var builtins = map[string]string{
"mitchellh.vmware": "vmware",
"mitchellh.vmware-esx": "vmware",
}
var ovftool string = "ovftool"
var (
@ -116,10 +111,6 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
}
func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, bool, error) {
if _, ok := builtins[artifact.BuilderId()]; !ok {
return nil, false, false, fmt.Errorf("Unknown artifact type, can't build box: %s", artifact.BuilderId())
}
source := ""
for _, path := range artifact.Files() {
if strings.HasSuffix(path, ".vmx") || strings.HasSuffix(path, ".ovf") || strings.HasSuffix(path, ".ova") {

7
website/source/docs/post-processors/vsphere.html.md
View File

@ -1,7 +1,6 @@
---
description: |
The Packer vSphere post-processor takes an artifact from the VMware builder and
uploads it to a vSphere endpoint.
The Packer vSphere post-processor takes an artifact and uploads it to a vSphere endpoint.
layout: docs
page_title: 'vSphere - Post-Processors'
sidebar_current: 'docs-post-processors-vsphere'
@ -11,8 +10,8 @@ sidebar_current: 'docs-post-processors-vsphere'
Type: `vsphere`
The Packer vSphere post-processor takes an artifact from the VMware builder and
uploads it to a vSphere endpoint.
The Packer vSphere post-processor takes an artifact and uploads it to a vSphere endpoint.
The artifact must have a vmx/ova/ovf image.
## Configuration