Merge "Add vagrant nodeset and make it the default"

README.md

@@ -88,13 +88,17 @@ Beaker-Rspec
 
 This module has beaker-rspec tests
 
-To run:
+To run the tests on the default vagrant node:
 
 ```shell
 bundle install
-BEAKER_setfile=default bundle exec rspec spec/acceptance
+bundle exec rspec spec/acceptance
 ```
 
+For more information on writing and running beaker-rspec tests visit the documentation:
+
+* https://github.com/puppetlabs/beaker/wiki/How-to-Write-a-Beaker-Test-for-a-Module
+
 Contributors
 ------------
 

spec/acceptance/nodesets/default.yml

@@ -1,9 +1,11 @@
 HOSTS:
-  ubuntu-14.04-amd64:
+  ubuntu-server-1404-x64:
     roles:
       - master
     platform: ubuntu-14.04-amd64
-    hypervisor : none
-    ip: 127.0.0.1
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
 CONFIG:
-  type: foss
+  log_level   : debug
+  type: git

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git