From 3bf53727e0bde21977f08bb9a536257bdf0d57d3 Mon Sep 17 00:00:00 2001 From: Charles Hooper Date: Wed, 27 Mar 2013 01:41:47 +0000 Subject: [PATCH] Stop using custom AMI and use standard Ubuntu AMI Upstream-commit: 8461196a794d0ccd42b958fd93b833b7df9a8ca5 Component: engine --- components/engine/Vagrantfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/Vagrantfile b/components/engine/Vagrantfile index 51614c5c20..37ad298b32 100644 --- a/components/engine/Vagrantfile +++ b/components/engine/Vagrantfile @@ -119,10 +119,11 @@ end aws.keypair_name = ENV["AWS_KEYPAIR_NAME"] aws.ssh_private_key_path = ENV["AWS_SSH_PRIVKEY"] aws.region = "us-east-1" - aws.ami = "ami-4e75ee27" + aws.ami = "ami-ae9806c7" aws.ssh_username = "ubuntu" aws.instance_type = "t1.micro" end + config.vm.provider :rackspace do |rs| config.vm.box = "dummy" config.vm.box_url = "https://github.com/mitchellh/vagrant-rackspace/raw/master/dummy.box" @@ -133,6 +134,7 @@ end rs.flavor = /512MB/ rs.image = /Ubuntu/ end + config.vm.provider :virtualbox do |vb| config.vm.box = "quantal64_3.5.0-25" config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box"