Improve Vagrant setup (#12)

* Ignore provisioning artifacts

* Properly place provisioner inside box definition

tests/.gitignore

@@ -0,0 +1,3 @@
+# Ignore provisioning artifacts
+data/
+*.retry

tests/vms/Vagrantfile.centos7

@@ -8,39 +8,39 @@ Vagrant.configure(2) do | config |
     vb.customize ["modifyvm", :id, "--memory", "2048"]
   end
 
-   config.vm.define "centos7" do |centos7|
+  config.vm.define "centos7" do |centos7|
     centos7.vm.hostname = "centos7.dev"
     centos7.vm.box = "geerlingguy/centos7"
     centos7.vm.network :private_network, ip: "192.168.40.4"
     centos7.vm.network "forwarded_port", guest: 3000, host: 3001
-  end
 
-  # Ansible
-  config.vm.provision "ansible" do |ansible|
-    ansible.groups = {
-      "sensu_masters" => ["centos7"],
-      "rabbitmq_servers" => ["centos7"],
-      "redis_servers" => ["centos7"],
-    }
+    # Ansible
+    config.vm.provision "ansible" do |ansible|
+      ansible.groups = {
+        "sensu_masters" => ["centos7"],
+        "rabbitmq_servers" => ["centos7"],
+        "redis_servers" => ["centos7"],
+      }
 
-    ansible.extra_vars = {
-      dynamic_data_store: "data/dynamic",
-      rabbitmq_host: "192.168.40.4",
-      rabbitmq_server: true,
-      redis_host: "192.168.40.4",
-      redis_server: true,
-      sensu_api_host: "192.168.40.4",
-      sensu_api_user_name: "admin",
-      sensu_api_password: "admin",
-      sensu_include_plugins: false,
-      sensu_include_dashboard: true,
-      sensu_master: true,
-      uchiwa_dc_name: "vagrant",
-      uchiwa_user_name: "admin",
-      uchiwa_password: "admin",
-    }
+      ansible.extra_vars = {
+        dynamic_data_store: "data/dynamic",
+        rabbitmq_host: "192.168.40.4",
+        rabbitmq_server: true,
+        redis_host: "192.168.40.4",
+        redis_server: true,
+        sensu_api_host: "192.168.40.4",
+        sensu_api_user_name: "admin",
+        sensu_api_password: "admin",
+        sensu_include_plugins: false,
+        sensu_include_dashboard: true,
+        sensu_master: true,
+        uchiwa_dc_name: "vagrant",
+        uchiwa_user_name: "admin",
+        uchiwa_password: "admin",
+      }
 
-    ansible.sudo = true
-    ansible.playbook = "provision.yml"
+      ansible.sudo = true
+      ansible.playbook = "provision.yml"
+    end
   end
 end

tests/vms/Vagrantfile.debian8

@@ -8,39 +8,39 @@ Vagrant.configure(2) do | config |
     vb.customize ["modifyvm", :id, "--memory", "2048"]
   end
 
-   config.vm.define "debian8" do |debian8|
+  config.vm.define "debian8" do |debian8|
     debian8.vm.hostname = "debian8.dev"
     debian8.vm.box = "debian/jessie64"
     debian8.vm.network :private_network, ip: "192.168.40.5"
     debian8.vm.network "forwarded_port", guest: 3000, host: 3002
-  end
 
-  # Ansible
-  config.vm.provision "ansible" do |ansible|
-    ansible.groups = {
-      "sensu_masters" => ["debian8"],
-      "rabbitmq_servers" => ["debian8"],
-      "redis_servers" => ["debian8"],
-    }
+    # Ansible
+    config.vm.provision "ansible" do |ansible|
+      ansible.groups = {
+        "sensu_masters" => ["debian8"],
+        "rabbitmq_servers" => ["debian8"],
+        "redis_servers" => ["debian8"],
+      }
 
-    ansible.extra_vars = {
-      dynamic_data_store: "data/dynamic",
-      rabbitmq_host: "192.168.40.5",
-      rabbitmq_server: true,
-      redis_host: "192.168.40.5",
-      redis_server: true,
-      sensu_api_host: "192.168.40.5",
-      sensu_api_user_name: "admin",
-      sensu_api_password: "admin",
-      sensu_include_plugins: false,
-      sensu_include_dashboard: true,
-      sensu_master: true,
-      uchiwa_dc_name: "vagrant",
-      uchiwa_user_name: "admin",
-      uchiwa_password: "admin",
-    }
+      ansible.extra_vars = {
+        dynamic_data_store: "data/dynamic",
+        rabbitmq_host: "192.168.40.5",
+        rabbitmq_server: true,
+        redis_host: "192.168.40.5",
+        redis_server: true,
+        sensu_api_host: "192.168.40.5",
+        sensu_api_user_name: "admin",
+        sensu_api_password: "admin",
+        sensu_include_plugins: false,
+        sensu_include_dashboard: true,
+        sensu_master: true,
+        uchiwa_dc_name: "vagrant",
+        uchiwa_user_name: "admin",
+        uchiwa_password: "admin",
+      }
 
-    ansible.sudo = true
-    ansible.playbook = "provision.yml"
+      ansible.sudo = true
+      ansible.playbook = "provision.yml"
+    end
   end
 end

tests/vms/Vagrantfile.ubuntu15

@@ -8,39 +8,39 @@ Vagrant.configure(2) do | config |
     vb.customize ["modifyvm", :id, "--memory", "2048"]
   end
 
-   config.vm.define "ubuntu15" do |ubuntu15|
+  config.vm.define "ubuntu15" do |ubuntu15|
     ubuntu15.vm.hostname = "ubuntu15.dev"
     ubuntu15.vm.box = "ubuntu/vivid64"
     ubuntu15.vm.network :private_network, ip: "192.168.40.6"
     ubuntu15.vm.network "forwarded_port", guest: 3000, host: 3003
-  end
 
-  # Ansible
-  config.vm.provision "ansible" do |ansible|
-    ansible.groups = {
-      "sensu_masters" => ["ubuntu15"],
-      "rabbitmq_servers" => ["ubuntu15"],
-      "redis_servers" => ["ubuntu15"],
-    }
+    # Ansible
+    config.vm.provision "ansible" do |ansible|
+      ansible.groups = {
+        "sensu_masters" => ["ubuntu15"],
+        "rabbitmq_servers" => ["ubuntu15"],
+        "redis_servers" => ["ubuntu15"],
+      }
 
-    ansible.extra_vars = {
-      dynamic_data_store: "data/dynamic",
-      rabbitmq_host: "192.168.40.6",
-      rabbitmq_server: true,
-      redis_host: "192.168.40.6",
-      redis_server: true,
-      sensu_api_host: "192.168.40.6",
-      sensu_api_user_name: "admin",
-      sensu_api_password: "admin",
-      sensu_include_plugins: false,
-      sensu_include_dashboard: true,
-      sensu_master: true,
-      uchiwa_dc_name: "vagrant",
-      uchiwa_user_name: "admin",
-      uchiwa_password: "admin",
-    }
+      ansible.extra_vars = {
+        dynamic_data_store: "data/dynamic",
+        rabbitmq_host: "192.168.40.6",
+        rabbitmq_server: true,
+        redis_host: "192.168.40.6",
+        redis_server: true,
+        sensu_api_host: "192.168.40.6",
+        sensu_api_user_name: "admin",
+        sensu_api_password: "admin",
+        sensu_include_plugins: false,
+        sensu_include_dashboard: true,
+        sensu_master: true,
+        uchiwa_dc_name: "vagrant",
+        uchiwa_user_name: "admin",
+        uchiwa_password: "admin",
+      }
 
-    ansible.sudo = true
-    ansible.playbook = "provision.yml"
+      ansible.sudo = true
+      ansible.playbook = "provision.yml"
+    end
   end
 end