Permalink
Browse files

Upgrade provisioning files

  • Loading branch information...
1 parent 1097eb2 commit 819f742ce51707dfc440f1bb31340945a89c9ceb @ereOn ereOn committed Dec 15, 2014
Showing with 25 additions and 5 deletions.
  1. +15 −4 Vagrantfile
  2. +9 −1 provisioning/playbook.yml
  3. +1 −0 provisioning/roles/freelan-speed-test/tasks/main.yml
View
@@ -5,12 +5,22 @@
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box = "ubuntu14.04_amd64"
- config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+ config.vm.box = "ubuntu14.10_amd64"
+ config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/utopic/current/utopic-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.define 'load-test' do |machine|
machine.vm.hostname = 'freelan-load-test'
- machine.vm.network :private_network, ip: "192.168.10.44"
+ machine.vm.network :private_network, ip: "192.168.10.10"
+ end
+
+ config.vm.define 'speed-test-a' do |machine|
+ machine.vm.hostname = 'freelan-speed-test-a'
+ machine.vm.network :private_network, ip: "192.168.10.20"
+ end
+
+ config.vm.define 'speed-test-b' do |machine|
+ machine.vm.hostname = 'freelan-speed-test-b'
+ machine.vm.network :private_network, ip: "192.168.10.21"
end
config.vm.provider "virtualbox" do |v|
@@ -30,7 +40,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
#ansible.skip_tags = "needs_internet_connection"
ansible.groups = {
- "build" => ["load-test"],
+ "load-test-group" => ["load-test"],
+ "speed-test-group" => ["speed-test-a", "speed-test-b"],
}
end
@@ -1,6 +1,14 @@
---
-- hosts: load-test
+- name: "Load testing machines"
+hosts: load-test-group
roles:
- apt
- freelan-build
- freelan-load-test
+
+- name: "Speed testing machines"
+ hosts: speed-test-group
+ roles:
+ - apt
+ - freelan-build
+ - freelan-speed-test

0 comments on commit 819f742

Please sign in to comment.