(maint) - Removal of legacy nodesets

diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
deleted file mode 100644 (file)
index 5eebdef..0000000
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    roles:
-      - agent
-      - default
-    platform: el-7-x86_64
-    hypervisor: vagrant
-    box: puppetlabs/centos-7.2-64-nocm
-CONFIG:
-  type: foss

diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
deleted file mode 100644 (file)
index fef6e63..0000000
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    roles:
-      - agent
-      - default
-    platform: debian-8-amd64
-    hypervisor: vagrant
-    box: puppetlabs/debian-8.2-64-nocm
-CONFIG:
-  type: foss

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644 (file)
index dba339c..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    roles:
-      - agent
-      - default
-    platform: ubuntu-14.04-amd64
-    hypervisor: vagrant
-    box: puppetlabs/ubuntu-14.04-64-nocm
-CONFIG:
-  type: foss

diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml
deleted file mode 100644 (file)
index a3333aa..0000000
--- a/spec/acceptance/nodesets/docker/centos-7.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    platform: el-7-x86_64
-    hypervisor: docker
-    image: centos:7
-    docker_preserve_image: true
-    docker_cmd: '["/usr/sbin/init"]'
-    # install various tools required to get the image up to usable levels
-    docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
-CONFIG:
-  trace_limit: 200

diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml
deleted file mode 100644 (file)
index df5c319..0000000
--- a/spec/acceptance/nodesets/docker/debian-8.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    hypervisor: docker
-    image: debian:8
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
-CONFIG:
-  trace_limit: 200

diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
deleted file mode 100644 (file)
index b1efa58..0000000
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    platform: ubuntu-14.04-amd64
-    hypervisor: docker
-    image: ubuntu:14.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      # ensure that upstart is booting correctly in the container
-      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
-CONFIG:
-  trace_limit: 200

diff --git a/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml b/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml
deleted file mode 100644 (file)
index 90a8e83..0000000
--- a/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-HOSTS:
-  debian-8-amd64-agent:
-    roles:
-    - agent
-    - default
-    platform: debian-8-amd64
-    template: debian-8-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  type: aio
-  ssh:
-    timeout: 600
-

diff --git a/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml b/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml
deleted file mode 100644 (file)
index 9e63eeb..0000000
--- a/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-HOSTS:
-  redhat-6-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-6-x86_64
-    template: redhat-6-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  type: aio
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml b/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml
deleted file mode 100644 (file)
index b9c352b..0000000
--- a/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-HOSTS:
-  redhat-7-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  type: aio
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml b/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml
deleted file mode 100644 (file)
index 9029d26..0000000
--- a/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-HOSTS:
-  ubuntu-1404-agent:
-    roles:
-    - agent
-    - default
-    platform: ubuntu-14.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  type: aio
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/aio/ubuntu-1604-64mda.yml b/spec/acceptance/nodesets/new/aio/ubuntu-1604-64mda.yml
deleted file mode 100644 (file)
index 80848a9..0000000
--- a/spec/acceptance/nodesets/new/aio/ubuntu-1604-64mda.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-HOSTS:
-  ubuntu-1604-agent:
-    roles:
-    - agent
-    - default
-    platform: ubuntu-16.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  type: aio
-  ssh:
-    timeout: 600

diff --git a/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml b/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml
deleted file mode 100644 (file)
index ba6c23c..0000000
--- a/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  centos-5-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-5-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600

diff --git a/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml b/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml
deleted file mode 100644 (file)
index e97e73f..0000000
--- a/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  centos-6-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-6-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600

diff --git a/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml b/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml
deleted file mode 100644 (file)
index 056b52d..0000000
--- a/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  centos-7-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-7-x86_64
-    template: centos-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600

diff --git a/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml
deleted file mode 100644 (file)
index 3101a5a..0000000
--- a/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  debian-6-amd64-agent:
-    roles:
-    - agent
-    - default
-    platform: debian-6-amd64
-    template: debian-6-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600

diff --git a/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml
deleted file mode 100644 (file)
index 4ebf914..0000000
--- a/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  debian-7-amd64-agent:
-    roles:
-    - agent
-    - default
-    platform: debian-7-amd64
-    template: debian-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml
deleted file mode 100644 (file)
index dc46f03..0000000
--- a/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-HOSTS:
-  debian-8-amd64-agent:
-    roles:
-    - agent
-    - default
-    platform: debian-8-amd64
-    template: debian-8-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
-

diff --git a/spec/acceptance/nodesets/new/pe/oracle-5-64mda.yml b/spec/acceptance/nodesets/new/pe/oracle-5-64mda.yml
deleted file mode 100644 (file)
index eb65fd4..0000000
--- a/spec/acceptance/nodesets/new/pe/oracle-5-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  oracle-5-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-5-x86_64
-    template: oracle-5-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600

diff --git a/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml b/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml
deleted file mode 100644 (file)
index 58e0fc0..0000000
--- a/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  oracle-6-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-6-x86_64
-    template: oracle-6-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml b/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml
deleted file mode 100644 (file)
index 157d814..0000000
--- a/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  oracle-7-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-7-x86_64
-    template: oracle-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml b/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml
deleted file mode 100644 (file)
index 56e45f5..0000000
--- a/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  redhat-5-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-5-x86_64
-    template: redhat-5-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml b/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml
deleted file mode 100644 (file)
index a41c585..0000000
--- a/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  redhat-6-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-6-x86_64
-    template: redhat-6-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml b/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml
deleted file mode 100644 (file)
index 6ed476b..0000000
--- a/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  redhat-7-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml b/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml
deleted file mode 100644 (file)
index 4ae3e43..0000000
--- a/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  scientific-5-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-5-x86_64
-    template: scientific-5-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml b/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml
deleted file mode 100644 (file)
index 0c9457f..0000000
--- a/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  scientific-6-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-6-x86_64
-    template: scientific-6-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml b/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml
deleted file mode 100644 (file)
index 80692bf..0000000
--- a/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  scientific-7-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: el-7-x86_64
-    template: scientific-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml b/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml
deleted file mode 100644 (file)
index 5761d8d..0000000
--- a/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  sles-10-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: sles-10-x86_64
-    template: sles-10-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml b/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml
deleted file mode 100644 (file)
index 660c72f..0000000
--- a/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  sles-11-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: sles-11-x86_64
-    template: sles-11-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml b/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml
deleted file mode 100644 (file)
index 0e7884c..0000000
--- a/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  sles-12-x86_64-agent:
-    roles:
-    - agent
-    - default
-    platform: sles-12-x86_64
-    template: sles-12-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml
deleted file mode 100644 (file)
index 0baeba8..0000000
--- a/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  ubuntu-1004-agent:
-    roles:
-    - agent
-    - default
-    platform: ubuntu-10.04-amd64
-    template: ubuntu-1004-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml
deleted file mode 100644 (file)
index d8c2931..0000000
--- a/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  ubuntu-1204-agent:
-    roles:
-    - agent
-    - default
-    platform: ubuntu-12.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml
deleted file mode 100644 (file)
index c53683d..0000000
--- a/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  ubuntu-1404-agent:
-    roles:
-    - agent
-    - default
-    platform: ubuntu-14.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1604-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1604-64mda.yml
deleted file mode 100644 (file)
index 2a5fdf3..0000000
--- a/spec/acceptance/nodesets/new/pe/ubuntu-1604-64mda.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-HOSTS:
-  ubuntu-1604-agent:
-    roles:
-    - agent
-    - default
-    platform: ubuntu-16.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-master:
-    roles:
-    - master
-    - dashboard
-    - database
-    - agent
-    platform: el-7-x86_64
-    template: redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  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/
-  ssh:
-    timeout: 600