Commit 4f568a0a authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

post-processor/vagrant: use common.PackerConfig

parent 334cf37f
...@@ -3,6 +3,7 @@ package vagrant ...@@ -3,6 +3,7 @@ package vagrant
import ( import (
"fmt" "fmt"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"io/ioutil" "io/ioutil"
"log" "log"
...@@ -13,10 +14,10 @@ import ( ...@@ -13,10 +14,10 @@ import (
) )
type AWSBoxConfig struct { type AWSBoxConfig struct {
common.PackerConfig `mapstructure:",squash"`
OutputPath string `mapstructure:"output"` OutputPath string `mapstructure:"output"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
PackerBuildName string `mapstructure:"packer_build_name"`
} }
type AWSVagrantfileTemplate struct { type AWSVagrantfileTemplate struct {
......
...@@ -19,8 +19,6 @@ var builtins = map[string]string{ ...@@ -19,8 +19,6 @@ var builtins = map[string]string{
type Config struct { type Config struct {
OutputPath string `mapstructure:"output"` OutputPath string `mapstructure:"output"`
PackerBuildName string `mapstructure:"packer_build_name"`
} }
type PostProcessor struct { type PostProcessor struct {
......
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"io/ioutil" "io/ioutil"
"log" "log"
...@@ -15,10 +16,10 @@ import ( ...@@ -15,10 +16,10 @@ import (
) )
type VBoxBoxConfig struct { type VBoxBoxConfig struct {
common.PackerConfig `mapstructure:",squash"`
OutputPath string `mapstructure:"output"` OutputPath string `mapstructure:"output"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
PackerBuildName string `mapstructure:"packer_build_name"`
} }
type VBoxVagrantfileTemplate struct { type VBoxVagrantfileTemplate struct {
......
...@@ -3,6 +3,7 @@ package vagrant ...@@ -3,6 +3,7 @@ package vagrant
import ( import (
"fmt" "fmt"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"io/ioutil" "io/ioutil"
"os" "os"
...@@ -11,10 +12,10 @@ import ( ...@@ -11,10 +12,10 @@ import (
) )
type VMwareBoxConfig struct { type VMwareBoxConfig struct {
common.PackerConfig `mapstructure:",squash"`
OutputPath string `mapstructure:"output"` OutputPath string `mapstructure:"output"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
PackerBuildName string `mapstructure:"packer_build_name"`
} }
type VMwareBoxPostProcessor struct { type VMwareBoxPostProcessor struct {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment