Merge "Synchronize nodeset (split trusty and centos)"

moduleroot/spec/acceptance/nodesets/centos-70-x64.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  centos-server-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: puppetlabs/centos-7.0-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: foss

moduleroot/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
+    box: puppetlabs/ubuntu-14.04-64-nocm
-    ip: 127.0.0.1
+    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
 CONFIG:
-  type: foss
+  log_level: debug
+  type: git

moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml

@@ -3,7 +3,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor : none
+    hypervisor: none
     ip: 127.0.0.1
 CONFIG:
   type: foss

moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml

@@ -1,9 +1,9 @@
 HOSTS:
-  ubuntu-14.04-amd64:
+  ubuntu-1404-x64:
     roles:
       - master
     platform: ubuntu-14.04-amd64
-    hypervisor : none
+    hypervisor: none
     ip: 127.0.0.1
 CONFIG:
   type: foss

moduleroot/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