Skip to content
This repository has been archived by the owner on Jan 25, 2022. It is now read-only.

Commit

Permalink
Force box update; remove AWS support in Vagrantfile
Browse files Browse the repository at this point in the history
[#112741695]

Signed-off-by: Matthew Sykes <[email protected]>
  • Loading branch information
ScarletTanager authored and sykesm committed Feb 4, 2016
1 parent d47a6eb commit 989f9ff
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
17 changes: 0 additions & 17 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,4 @@ Vagrant.configure("2") do |config|
config.vm.box = "cloudfoundry/warden-compatible"

config.vm.synced_folder '~/workspace/cf-release', '/var/cf-release'

# Requires vagrant-aws and unf plugins
config.vm.provider :aws do |aws, override|
override.vm.box = "dummy"
override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"

override.ssh.private_key_path = ENV["WARDEN_AWS_PRIVATE_KEY_PATH"]

aws.ami = ENV["WARDEN_COMPATIBLE_AMI"] || "ami-e0b64188"
aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
aws.instance_type = "m3.medium"
aws.tags = { "Name" => "warden-test" }
aws.block_device_mapping = [{
:DeviceName => "/dev/sda1", 'Ebs.VolumeSize' => 40
}]
end
end
1 change: 1 addition & 0 deletions bin/test_in_vm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -e -x -u

cd $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
vagrant box update
vagrant up
echo "===== VAGRANT BOX PROVISIONED AND STARTED ====="

Expand Down

0 comments on commit 989f9ff

Please sign in to comment.