Merge pull request #9146 from jhawk28/bug_9141

add vsphere builder's artifact to vsphere-template's supported types
This commit is contained in:
Wilken Rivera 2020-05-05 14:27:52 -04:00 committed by GitHub
commit dc6de091e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions

View File

@ -10,20 +10,23 @@ import (
"strings" "strings"
"time" "time"
"github.com/hashicorp/hcl/v2/hcldec"
vmwcommon "github.com/hashicorp/packer/builder/vmware/common" vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
vsphere "github.com/hashicorp/packer/builder/vsphere/common"
vspherepost "github.com/hashicorp/packer/post-processor/vsphere"
"github.com/hashicorp/hcl/v2/hcldec"
"github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common"
"github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/config"
"github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/multistep"
"github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer"
"github.com/hashicorp/packer/post-processor/vsphere"
"github.com/hashicorp/packer/template/interpolate" "github.com/hashicorp/packer/template/interpolate"
"github.com/vmware/govmomi" "github.com/vmware/govmomi"
) )
var builtins = map[string]string{ var builtins = map[string]string{
vsphere.BuilderId: "vmware", vspherepost.BuilderId: "vmware",
vmwcommon.BuilderIdESX: "vmware", vmwcommon.BuilderIdESX: "vmware",
vsphere.BuilderId: "vsphere",
} }
type Config struct { type Config struct {