From 1b74629db058f80271ece62912baca524db215bf Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <josh@hoblitt.com>
Date: Sun, 25 Jan 2015 16:00:22 -0700
Subject: [PATCH] update beaker nodesets from puppet-module_skel

---
 spec/acceptance/nodesets/aix-71-vcloud.yml    | 19 +++++++++++++++++++
 spec/acceptance/nodesets/centos-64-x64.yml    |  2 +-
 spec/acceptance/nodesets/centos-65-x64.yml    | 10 ++++++++++
 spec/acceptance/nodesets/centos-70-x64.yml    | 10 ++++++++++
 spec/acceptance/nodesets/default.yml          |  8 ++++----
 spec/acceptance/nodesets/fedora-18-x64.yml    |  2 +-
 .../nodesets/ubuntu-server-10044-x64.yml      |  2 +-
 .../nodesets/ubuntu-server-12042-x64.yml      |  2 +-
 8 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 spec/acceptance/nodesets/aix-71-vcloud.yml
 create mode 100644 spec/acceptance/nodesets/centos-65-x64.yml
 create mode 100644 spec/acceptance/nodesets/centos-70-x64.yml

diff --git a/spec/acceptance/nodesets/aix-71-vcloud.yml b/spec/acceptance/nodesets/aix-71-vcloud.yml
new file mode 100644
index 0000000..f0ae87a
--- /dev/null
+++ b/spec/acceptance/nodesets/aix-71-vcloud.yml
@@ -0,0 +1,19 @@
+HOSTS:
+  pe-aix-71-acceptance:
+    roles:
+      - master
+      - dashboard
+      - database
+      - agent
+      - default
+    platform: aix-7.1-power
+    hypervisor: aix
+    ip: pe-aix-71-acceptance.delivery.puppetlabs.net
+CONFIG:
+  type: pe
+  nfs_server: NONE
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/spec/acceptance/nodesets/centos-64-x64.yml b/spec/acceptance/nodesets/centos-64-x64.yml
index 05540ed..0639835 100644
--- a/spec/acceptance/nodesets/centos-64-x64.yml
+++ b/spec/acceptance/nodesets/centos-64-x64.yml
@@ -7,4 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  type: foss
+  type: git
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
new file mode 100644
index 0000000..4e2cb80
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  centos-65-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-65-x64-vbox436-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss
diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml
new file mode 100644
index 0000000..8c1e6b4
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-70-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  centos-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box : puppetlabs/centos-7.0-64-nocm
+    box_url : https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index 2dd9457..0639835 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  centos-65-x64.localdomain:
+  centos-64-x64:
     roles:
       - master
     platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  type: foss
+  type: git
diff --git a/spec/acceptance/nodesets/fedora-18-x64.yml b/spec/acceptance/nodesets/fedora-18-x64.yml
index 1361649..624b537 100644
--- a/spec/acceptance/nodesets/fedora-18-x64.yml
+++ b/spec/acceptance/nodesets/fedora-18-x64.yml
@@ -7,4 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  type: foss
+  type: git
diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
index 5ca1514..5047017 100644
--- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -7,4 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  type: foss
+  type: git
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
index d065b30..1c7a34c 100644
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -7,4 +7,4 @@ HOSTS:
     box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
-  type: foss
+  type: git