...
|
...
|
@@ -112,19 +112,19 @@ end
|
112
|
112
|
|
113
|
113
|
"#{Vagrant::VERSION}" >= "1.1.0" and Vagrant.configure("2") do |config|
|
114
|
114
|
config.vm.provider :aws do |aws|
|
115
|
|
- config.vm.box = "dummy"
|
116
|
|
- config.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
|
|
115
|
+ config.vm.box = "dummy"
|
|
116
|
+ config.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
|
117
|
117
|
aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
|
118
|
|
- aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
|
119
|
|
- aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]
|
120
|
|
- aws.ssh_private_key_path = ENV["AWS_SSH_PRIVKEY"]
|
121
|
|
- aws.region = "us-east-1"
|
|
118
|
+ aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
|
|
119
|
+ aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]
|
|
120
|
+ aws.ssh_private_key_path = ENV["AWS_SSH_PRIVKEY"]
|
|
121
|
+ aws.region = "us-east-1"
|
122
|
122
|
aws.ami = "ami-1c1e8075"
|
123
|
123
|
aws.ssh_username = "vagrant"
|
124
|
|
- aws.instance_type = "t1.micro"
|
|
124
|
+ aws.instance_type = "t1.micro"
|
125
|
125
|
end
|
126
|
126
|
config.vm.provider :virtualbox do |vb|
|
127
|
|
- config.vm.box = "quantal64_3.5.0-25"
|
128
|
|
- config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box"
|
129
|
|
- end
|
|
127
|
+ config.vm.box = "quantal64_3.5.0-25"
|
|
128
|
+ config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box"
|
|
129
|
+ end
|
130
|
130
|
end
|