From a6e5a806be5aeca760b14b1a5abc080ee9636ffe Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Wed, 11 May 2016 16:05:02 -0700
Subject: [PATCH] (maint) Update hostfile for acceptance test

Prior to this commit, strings had a hostfile that was using an old
format that is no longer compatible with beaker which was causing
the acceptance tests to fail.

Update the hostfile so that it works.
---
 spec/acceptance/nodesets/centos7.yml  | 17 +++++++++++++++++
 spec/acceptance/nodesets/fedora23.yml | 13 -------------
 2 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 spec/acceptance/nodesets/centos7.yml
 delete mode 100644 spec/acceptance/nodesets/fedora23.yml

diff --git a/spec/acceptance/nodesets/centos7.yml b/spec/acceptance/nodesets/centos7.yml
new file mode 100644
index 0000000..216f639
--- /dev/null
+++ b/spec/acceptance/nodesets/centos7.yml
@@ -0,0 +1,17 @@
+---
+HOSTS:
+  centos7-64-1:
+    pe_dir: 
+    pe_ver: 
+    pe_upgrade_dir: 
+    pe_upgrade_ver: 
+    hypervisor: vmpooler
+    platform: el-7-x86_64
+    template: centos-7-x86_64
+    roles:
+    - agent
+    - master
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/spec/acceptance/nodesets/fedora23.yml b/spec/acceptance/nodesets/fedora23.yml
deleted file mode 100644
index 1e1c3ee..0000000
--- a/spec/acceptance/nodesets/fedora23.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-HOSTS:
-  master:
-    roles:
-      - master
-    platform: fedora-23-x86_64
-    hypervisor: vcloud
-    template: Delivery/Quality Assurance/Templates/vCloud/fedora-23-x86_64
-CONFIG:
-  filecount: 12
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/