Merge pull request #503 from zimbatm/fix/vagrant-aws-instance

post-processor/vagrant: support instance store AMIs [GH-503]

Merge pull request #503 from zimbatm/fix/vagrant-aws-instance
post-processor/vagrant: support instance store AMIs [GH-503]
87c1ebad · Mitchell Hashimoto · e54a723f · a3042673 · 87c1ebad
Commit 87c1ebad authored Oct 14, 2013 by Mitchell Hashimoto
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

post-processor/vagrant/post-processor.go post-processor/vagrant/post-processor.go +4 -3

No files found.
--- a/post-processor/vagrant/post-processor.go
+++ b/post-processor/vagrant/post-processor.go
@@ -12,9 +12,10 @@ import (
 )

 var builtins = map[string]string{
-	"mitchellh.amazonebs":  "aws",
-	"mitchellh.virtualbox": "virtualbox",
-	"mitchellh.vmware":     "vmware",
+	"mitchellh.amazonebs":       "aws",
+	"mitchellh.amazon.instance": "aws",
+	"mitchellh.virtualbox":      "virtualbox",
+	"mitchellh.vmware":          "vmware",
 }

 type Config struct {