diff --git a/post-processor/vagrant/aws.go b/post-processor/vagrant/aws.go index 747207832..d03c01196 100644 --- a/post-processor/vagrant/aws.go +++ b/post-processor/vagrant/aws.go @@ -3,6 +3,7 @@ package vagrant import ( "fmt" "github.com/mitchellh/mapstructure" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "io/ioutil" "log" @@ -13,10 +14,10 @@ import ( ) type AWSBoxConfig struct { + common.PackerConfig `mapstructure:",squash"` + OutputPath string `mapstructure:"output"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"` - - PackerBuildName string `mapstructure:"packer_build_name"` } type AWSVagrantfileTemplate struct { diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 0ad450dc8..a868978b3 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -19,8 +19,6 @@ var builtins = map[string]string{ type Config struct { OutputPath string `mapstructure:"output"` - - PackerBuildName string `mapstructure:"packer_build_name"` } type PostProcessor struct { diff --git a/post-processor/vagrant/virtualbox.go b/post-processor/vagrant/virtualbox.go index 0539d0167..539f5da6e 100644 --- a/post-processor/vagrant/virtualbox.go +++ b/post-processor/vagrant/virtualbox.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "github.com/mitchellh/mapstructure" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "io/ioutil" "log" @@ -15,10 +16,10 @@ import ( ) type VBoxBoxConfig struct { + common.PackerConfig `mapstructure:",squash"` + OutputPath string `mapstructure:"output"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"` - - PackerBuildName string `mapstructure:"packer_build_name"` } type VBoxVagrantfileTemplate struct { diff --git a/post-processor/vagrant/vmware.go b/post-processor/vagrant/vmware.go index 471582026..fb5718ae1 100644 --- a/post-processor/vagrant/vmware.go +++ b/post-processor/vagrant/vmware.go @@ -3,6 +3,7 @@ package vagrant import ( "fmt" "github.com/mitchellh/mapstructure" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "io/ioutil" "os" @@ -11,10 +12,10 @@ import ( ) type VMwareBoxConfig struct { + common.PackerConfig `mapstructure:",squash"` + OutputPath string `mapstructure:"output"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"` - - PackerBuildName string `mapstructure:"packer_build_name"` } type VMwareBoxPostProcessor struct {