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

post-processor/vagrant: support instance store AMIs [GH-503]
2013-10-14 01:56:24 -07:00 · 2013-10-14 01:56:24 -07:00 · 111392ad43
commit 111392ad43
parent bfba541338 c2ff4ded9c
1 changed files with 4 additions and 3 deletions
--- 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 {