diff --git a/acceptance/config/nodes/all.yaml b/acceptance/config/nodes/all.yaml index 359f99afb..0d2ed3741 100644 --- a/acceptance/config/nodes/all.yaml +++ b/acceptance/config/nodes/all.yaml @@ -1,55 +1,55 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 rhel-agent: roles: - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 fedora-agent: roles: - agent platform: fedora-18-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-18-i386 + template: fedora-18-i386 ubuntu-agent: roles: - agent platform: ubuntu-lucid-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 wheezy-agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 centos-agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 solaris-agent: roles: - agent platform: solaris-11-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/solaris-11-x86_64 + template: solaris-11-x86_64 win2003r2-ruby193-2: roles: - agent platform: windows-2003r2-32 hypervisor: vsphere snapshot: git CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/all_but_windows.yaml b/acceptance/config/nodes/all_but_windows.yaml index 5ca7e2c88..05d65a541 100644 --- a/acceptance/config/nodes/all_but_windows.yaml +++ b/acceptance/config/nodes/all_but_windows.yaml @@ -1,49 +1,49 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 rhel-agent: roles: - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 fedora-agent: roles: - agent platform: fedora-18-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-18-i386 + template: fedora-18-i386 ubuntu-agent: roles: - agent platform: ubuntu-lucid-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 wheezy-agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 centos-agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 solaris-agent: roles: - agent platform: solaris-11-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/solaris-11-x86_64 + template: solaris-11-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/all_linux.yaml b/acceptance/config/nodes/all_linux.yaml index b2fbcb429..73a16eca1 100644 --- a/acceptance/config/nodes/all_linux.yaml +++ b/acceptance/config/nodes/all_linux.yaml @@ -1,43 +1,43 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 rhel-agent: roles: - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 fedora-agent: roles: - agent platform: fedora-18-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-18-i386 + template: fedora-18-i386 ubuntu-agent: roles: - agent platform: ubuntu-lucid-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 wheezy-agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 centos-agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/centos5.yaml b/acceptance/config/nodes/centos5.yaml index 4ebfb37e3..49a5f2ab5 100644 --- a/acceptance/config/nodes/centos5.yaml +++ b/acceptance/config/nodes/centos5.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: centos-5-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 + template: centos-5-x86_64 agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/centos6.yaml b/acceptance/config/nodes/centos6.yaml index 99f6593f4..c6512b232 100644 --- a/acceptance/config/nodes/centos6.yaml +++ b/acceptance/config/nodes/centos6.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: centos-6-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 agent: roles: - agent platform: centos-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-i386 + template: centos-6-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/fedora18.yaml b/acceptance/config/nodes/fedora18.yaml index 899fc04b5..1a969b089 100644 --- a/acceptance/config/nodes/fedora18.yaml +++ b/acceptance/config/nodes/fedora18.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: fedora-18-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-18-x86_64 + template: fedora-18-x86_64 agent: roles: - agent platform: fedora-18-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-18-i386 + template: fedora-18-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/fedora19.yaml b/acceptance/config/nodes/fedora19.yaml index 2a999c495..65cb70909 100644 --- a/acceptance/config/nodes/fedora19.yaml +++ b/acceptance/config/nodes/fedora19.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: fedora-19-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-19-x86_64 + template: fedora-19-x86_64 agent: roles: - agent platform: fedora-19-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-19-i386 + template: fedora-19-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/fedora20.yaml b/acceptance/config/nodes/fedora20.yaml index 9a7bb3a80..a5065e3b5 100644 --- a/acceptance/config/nodes/fedora20.yaml +++ b/acceptance/config/nodes/fedora20.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: fedora-20-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-20-x86_64 + template: fedora-20-x86_64 agent: roles: - agent platform: fedora-20-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/fedora-20-i386 + template: fedora-20-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/foss-win-2003r2-ruby193.yaml b/acceptance/config/nodes/foss-win-2003r2-ruby193.yaml index 05e14c5d6..4d9c9cbe4 100644 --- a/acceptance/config/nodes/foss-win-2003r2-ruby193.yaml +++ b/acceptance/config/nodes/foss-win-2003r2-ruby193.yaml @@ -1,23 +1,23 @@ HOSTS: master: roles: - master - database - agent - dashboard platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 win2003r2-ruby193-2: roles: - agent platform: windows-2003r2-32 hypervisor: vsphere snapshot: git CONFIG: nfs_server: NONE consoleport: 443 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/lucid.yaml index a9074eb3f..b18651902 100644 --- a/acceptance/config/nodes/lucid.yaml +++ b/acceptance/config/nodes/lucid.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: ubuntu-lucid-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64 + template: ubuntu-1004-x86_64 agent: roles: - agent platform: ubuntu-lucid-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/pe/centos-5-32ma-32da-32da b/acceptance/config/nodes/pe/centos-5-32ma-32da-32da index 6970dfb3b..efb3c47d0 100644 --- a/acceptance/config/nodes/pe/centos-5-32ma-32da-32da +++ b/acceptance/config/nodes/pe/centos-5-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: centos-5-i386-master: roles: - master - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 hypervisor: vcloud centos-5-i386-dashboard: roles: - dashboard - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 hypervisor: vcloud centos-5-i386-database: roles: - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-5-32mda b/acceptance/config/nodes/pe/centos-5-32mda index 602dc734a..b7c9a81e7 100644 --- a/acceptance/config/nodes/pe/centos-5-32mda +++ b/acceptance/config/nodes/pe/centos-5-32mda @@ -1,22 +1,22 @@ HOSTS: centos-5-i386: roles: - master - dashboard - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 hypervisor: vcloud centos-5-i386-agent: roles: - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-i386 + template: centos-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-5-64ma-64da-64da b/acceptance/config/nodes/pe/centos-5-64ma-64da-64da index 0d714d9d8..d1ab0463e 100644 --- a/acceptance/config/nodes/pe/centos-5-64ma-64da-64da +++ b/acceptance/config/nodes/pe/centos-5-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: centos-5-x86_64-master: roles: - master - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 + template: centos-5-x86_64 hypervisor: vcloud centos-5-x86_64-dashboard: roles: - dashboard - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 + template: centos-5-x86_64 hypervisor: vcloud centos-5-x86_64-database: roles: - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 + template: centos-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-5-64mda b/acceptance/config/nodes/pe/centos-5-64mda index b12743d31..3f3552d8c 100644 --- a/acceptance/config/nodes/pe/centos-5-64mda +++ b/acceptance/config/nodes/pe/centos-5-64mda @@ -1,22 +1,22 @@ HOSTS: centos-5-x86_64: roles: - master - dashboard - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 + template: centos-5-x86_64 hypervisor: vcloud centos-5-x86_64-agent: roles: - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 + template: centos-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-32ma-32da-32da b/acceptance/config/nodes/pe/centos-6-32ma-32da-32da index cfa2cd54a..1b0f010b8 100644 --- a/acceptance/config/nodes/pe/centos-6-32ma-32da-32da +++ b/acceptance/config/nodes/pe/centos-6-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: centos-6-i386-master: roles: - master - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-i386 + template: centos-6-i386 hypervisor: vcloud centos-6-i386-dashboard: roles: - dashboard - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-i386 + template: centos-6-i386 hypervisor: vcloud centos-6-i386-database: roles: - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-i386 + template: centos-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-32mda b/acceptance/config/nodes/pe/centos-6-32mda index 9be3b43a8..2d2797563 100644 --- a/acceptance/config/nodes/pe/centos-6-32mda +++ b/acceptance/config/nodes/pe/centos-6-32mda @@ -1,22 +1,22 @@ HOSTS: centos-6-i386: roles: - master - dashboard - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-i386 + template: centos-6-i386 hypervisor: vcloud centos-6-i386-agent: roles: - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-i386 + template: centos-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-64ma-64da-64da b/acceptance/config/nodes/pe/centos-6-64ma-64da-64da index d16b976bf..81aa349c6 100644 --- a/acceptance/config/nodes/pe/centos-6-64ma-64da-64da +++ b/acceptance/config/nodes/pe/centos-6-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: centos-6-x86_64-master: roles: - master - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 hypervisor: vcloud centos-6-x86_64-dashboard: roles: - dashboard - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 hypervisor: vcloud centos-6-x86_64-database: roles: - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-64mda b/acceptance/config/nodes/pe/centos-6-64mda index 3c0c12ea9..a6647dfaf 100644 --- a/acceptance/config/nodes/pe/centos-6-64mda +++ b/acceptance/config/nodes/pe/centos-6-64mda @@ -1,22 +1,22 @@ HOSTS: centos-6-x86_64: roles: - master - dashboard - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 hypervisor: vcloud centos-6-x86_64-agent: roles: - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a b/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a index 8908291a4..d787bc167 100644 --- a/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a +++ b/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a @@ -1,22 +1,22 @@ HOSTS: centos-6-x86_64: roles: - master - dashboard - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 + template: centos-6-x86_64 hypervisor: vcloud solaris-10-x86_64-agent: roles: - agent platform: solaris-10-i386 - template: Delivery/Quality Assurance/Templates/vCloud/solaris-10-x86_64 + template: solaris-10-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-32ma-32da-32da b/acceptance/config/nodes/pe/debian-6-32ma-32da-32da index 86c698a2b..6243edf91 100644 --- a/acceptance/config/nodes/pe/debian-6-32ma-32da-32da +++ b/acceptance/config/nodes/pe/debian-6-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: debian-6-i386-master: roles: - master - agent platform: debian-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386 + template: debian-6-i386 hypervisor: vcloud debian-6-i386-dashboard: roles: - dashboard - agent platform: debian-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386 + template: debian-6-i386 hypervisor: vcloud debian-6-i386-database: roles: - database - agent platform: debian-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386 + template: debian-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-32mda b/acceptance/config/nodes/pe/debian-6-32mda index fd1a6be90..0e786fc2e 100644 --- a/acceptance/config/nodes/pe/debian-6-32mda +++ b/acceptance/config/nodes/pe/debian-6-32mda @@ -1,22 +1,22 @@ HOSTS: debian-6-i386: roles: - master - dashboard - database - agent platform: debian-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386 + template: debian-6-i386 hypervisor: vcloud debian-6-i386-agent: roles: - agent platform: debian-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386 + template: debian-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-64ma-64da-64da b/acceptance/config/nodes/pe/debian-6-64ma-64da-64da index f39520b5e..26e49d6ee 100644 --- a/acceptance/config/nodes/pe/debian-6-64ma-64da-64da +++ b/acceptance/config/nodes/pe/debian-6-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: debian-6-amd64-master: roles: - master - agent platform: debian-6-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64 + template: debian-6-x86_64 hypervisor: vcloud debian-6-amd64-dashboard: roles: - dashboard - agent platform: debian-6-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64 + template: debian-6-x86_64 hypervisor: vcloud debian-6-amd64-database: roles: - database - agent platform: debian-6-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64 + template: debian-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-64mda b/acceptance/config/nodes/pe/debian-6-64mda index 03df60280..04ec5e7bd 100644 --- a/acceptance/config/nodes/pe/debian-6-64mda +++ b/acceptance/config/nodes/pe/debian-6-64mda @@ -1,22 +1,22 @@ HOSTS: debian-6-amd64: roles: - master - dashboard - database - agent platform: debian-6-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64 + template: debian-6-x86_64 hypervisor: vcloud debian-6-amd64-agent: roles: - agent platform: debian-6-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64 + template: debian-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-32ma-32da-32da b/acceptance/config/nodes/pe/debian-7-32ma-32da-32da index 9690dfd53..efe5cbd01 100644 --- a/acceptance/config/nodes/pe/debian-7-32ma-32da-32da +++ b/acceptance/config/nodes/pe/debian-7-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: debian-7-i386-master: roles: - master - agent platform: debian-7-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 hypervisor: vcloud debian-7-i386-dashboard: roles: - dashboard - agent platform: debian-7-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 hypervisor: vcloud debian-7-i386-database: roles: - database - agent platform: debian-7-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-32mda b/acceptance/config/nodes/pe/debian-7-32mda index f7812efb1..b42cc924e 100644 --- a/acceptance/config/nodes/pe/debian-7-32mda +++ b/acceptance/config/nodes/pe/debian-7-32mda @@ -1,22 +1,22 @@ HOSTS: debian-7-i386: roles: - master - dashboard - database - agent platform: debian-7-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 hypervisor: vcloud debian-7-i386-agent: roles: - agent platform: debian-7-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-64ma-64da-64da b/acceptance/config/nodes/pe/debian-7-64ma-64da-64da index 37ee31b2b..e30552a11 100644 --- a/acceptance/config/nodes/pe/debian-7-64ma-64da-64da +++ b/acceptance/config/nodes/pe/debian-7-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: debian-7-amd64-master: roles: - master - agent platform: debian-7-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64 + template: debian-7-x86_64 hypervisor: vcloud debian-7-amd64-dashboard: roles: - dashboard - agent platform: debian-7-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64 + template: debian-7-x86_64 hypervisor: vcloud debian-7-amd64-database: roles: - database - agent platform: debian-7-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64 + template: debian-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 diff --git a/acceptance/config/nodes/pe/debian-7-64mda b/acceptance/config/nodes/pe/debian-7-64mda index 01ed6a997..9f2f2ca79 100644 --- a/acceptance/config/nodes/pe/debian-7-64mda +++ b/acceptance/config/nodes/pe/debian-7-64mda @@ -1,22 +1,22 @@ HOSTS: debian-7-amd64: roles: - master - dashboard - database - agent platform: debian-7-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64 + template: debian-7-x86_64 hypervisor: vcloud debian-7-amd64-agent: roles: - agent platform: debian-7-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64 + template: debian-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 diff --git a/acceptance/config/nodes/pe/debian-7-i386 b/acceptance/config/nodes/pe/debian-7-i386 index 8857b2c5d..691739de4 100644 --- a/acceptance/config/nodes/pe/debian-7-i386 +++ b/acceptance/config/nodes/pe/debian-7-i386 @@ -1,16 +1,16 @@ HOSTS: debian-7-i386: roles: - master - dashboard - database - agent platform: debian-7-i386 - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da b/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da index 9cf395c60..07d0140ed 100644 --- a/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da +++ b/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: oracle-5-i386-master: roles: - master - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-i386 + template: oracle-5-i386 hypervisor: vcloud oracle-5-i386-dashboard: roles: - dashboard - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-i386 + template: oracle-5-i386 hypervisor: vcloud oracle-5-i386-database: roles: - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-i386 + template: oracle-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-32mda b/acceptance/config/nodes/pe/oracle-5-32mda index dda788e0c..dc5ca19ee 100644 --- a/acceptance/config/nodes/pe/oracle-5-32mda +++ b/acceptance/config/nodes/pe/oracle-5-32mda @@ -1,22 +1,22 @@ HOSTS: oracle-5-i386: roles: - master - dashboard - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-i386 + template: oracle-5-i386 hypervisor: vcloud oracle-5-i386-agent: roles: - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-i386 + template: oracle-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da b/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da index a6a73966c..1007f8402 100644 --- a/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da +++ b/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: oracle-5-x86_64-master: roles: - master - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-x86_64 + template: oracle-5-x86_64 hypervisor: vcloud oracle-5-x86_64-dashboard: roles: - dashboard - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-x86_64 + template: oracle-5-x86_64 hypervisor: vcloud oracle-5-x86_64-database: roles: - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-x86_64 + template: oracle-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-64mda b/acceptance/config/nodes/pe/oracle-5-64mda index 7a4aa4136..5db926a92 100644 --- a/acceptance/config/nodes/pe/oracle-5-64mda +++ b/acceptance/config/nodes/pe/oracle-5-64mda @@ -1,22 +1,22 @@ HOSTS: oracle-5-x86_64: roles: - master - dashboard - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-x86_64 + template: oracle-5-x86_64 hypervisor: vcloud oracle-5-x86_64-agent: roles: - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-5-x86_64 + template: oracle-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da b/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da index c86b875c1..0ab5ec6f6 100644 --- a/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da +++ b/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: oracle-6-i386-master: roles: - master - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-i386 + template: oracle-6-i386 hypervisor: vcloud oracle-6-i386-dashboard: roles: - dashboard - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-i386 + template: oracle-6-i386 hypervisor: vcloud oracle-6-i386-database: roles: - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-i386 + template: oracle-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-32mda b/acceptance/config/nodes/pe/oracle-6-32mda index 06c27a6ec..93e9620f7 100644 --- a/acceptance/config/nodes/pe/oracle-6-32mda +++ b/acceptance/config/nodes/pe/oracle-6-32mda @@ -1,22 +1,22 @@ HOSTS: oracle-6-i386: roles: - master - dashboard - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-i386 + template: oracle-6-i386 hypervisor: vcloud oracle-6-i386-agent: roles: - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-i386 + template: oracle-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da b/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da index 0b7e5b2d6..1c4c36132 100644 --- a/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da +++ b/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: oracle-6-x86_64-master: roles: - master - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-x86_64 + template: oracle-6-x86_64 hypervisor: vcloud oracle-6-x86_64-dashboard: roles: - dashboard - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-x86_64 + template: oracle-6-x86_64 hypervisor: vcloud oracle-6-x86_64-database: roles: - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-x86_64 + template: oracle-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-64mda b/acceptance/config/nodes/pe/oracle-6-64mda index a37d09e9b..3c21a1c93 100644 --- a/acceptance/config/nodes/pe/oracle-6-64mda +++ b/acceptance/config/nodes/pe/oracle-6-64mda @@ -1,22 +1,22 @@ HOSTS: oracle-6-x86_64: roles: - master - dashboard - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-x86_64 + template: oracle-6-x86_64 hypervisor: vcloud oracle-6-x86_64-agent: roles: - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/oracle-6-x86_64 + template: oracle-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da b/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da index 38cd8bea8..946440d7e 100644 --- a/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da +++ b/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: redhat-5-i386-master: roles: - master - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 hypervisor: vcloud redhat-5-i386-dashboard: roles: - dashboard - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 hypervisor: vcloud redhat-5-i386-database: roles: - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-32mda b/acceptance/config/nodes/pe/redhat-5-32mda index 3a11de98b..a4704bbce 100644 --- a/acceptance/config/nodes/pe/redhat-5-32mda +++ b/acceptance/config/nodes/pe/redhat-5-32mda @@ -1,22 +1,22 @@ HOSTS: redhat-5-i386: roles: - master - dashboard - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 hypervisor: vcloud redhat-5-i386-agent: roles: - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da b/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da index d6e637832..eeaa242bd 100644 --- a/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da +++ b/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: redhat-5-x86_64-master: roles: - master - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-x86_64 + template: redhat-5-x86_64 hypervisor: vcloud redhat-5-x86_64-dashboard: roles: - dashboard - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-x86_64 + template: redhat-5-x86_64 hypervisor: vcloud redhat-5-x86_64-database: roles: - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-x86_64 + template: redhat-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-64mda b/acceptance/config/nodes/pe/redhat-5-64mda index 417422464..245fdf945 100644 --- a/acceptance/config/nodes/pe/redhat-5-64mda +++ b/acceptance/config/nodes/pe/redhat-5-64mda @@ -1,22 +1,22 @@ HOSTS: redhat-5-x86_64: roles: - master - dashboard - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-x86_64 + template: redhat-5-x86_64 hypervisor: vcloud redhat-5-x86_64-agent: roles: - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-x86_64 + template: redhat-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da b/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da index dacf932d2..842bd83af 100644 --- a/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da +++ b/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: redhat-6-i386-master: roles: - master - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 hypervisor: vcloud redhat-6-i386-dashboard: roles: - dashboard - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 hypervisor: vcloud redhat-6-i386-database: roles: - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-32mda b/acceptance/config/nodes/pe/redhat-6-32mda index a7dd6348d..9c6af2a95 100644 --- a/acceptance/config/nodes/pe/redhat-6-32mda +++ b/acceptance/config/nodes/pe/redhat-6-32mda @@ -1,22 +1,22 @@ HOSTS: redhat-6-i386: roles: - master - dashboard - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 hypervisor: vcloud redhat-6-i386-agent: roles: - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da b/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da index ef8a71cbd..38b8d40de 100644 --- a/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da +++ b/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: redhat-6-x86_64-master: roles: - master - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 hypervisor: vcloud redhat-6-x86_64-dashboard: roles: - dashboard - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 hypervisor: vcloud redhat-6-x86_64-database: roles: - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-64mda b/acceptance/config/nodes/pe/redhat-6-64mda index 702ca3d05..62bfde9cc 100644 --- a/acceptance/config/nodes/pe/redhat-6-64mda +++ b/acceptance/config/nodes/pe/redhat-6-64mda @@ -1,22 +1,22 @@ HOSTS: redhat-6-x86_64: roles: - master - dashboard - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 hypervisor: vcloud redhat-6-x86_64-agent: roles: - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da b/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da index ae3a375be..f913e626a 100644 --- a/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da +++ b/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: scientific-5-i386-master: roles: - master - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-i386 + template: scientific-5-i386 hypervisor: vcloud scientific-5-i386-dashboard: roles: - dashboard - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-i386 + template: scientific-5-i386 hypervisor: vcloud scientific-5-i386-database: roles: - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-i386 + template: scientific-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-32mda b/acceptance/config/nodes/pe/scientific-5-32mda index 9bbf35e6f..d4d059e65 100644 --- a/acceptance/config/nodes/pe/scientific-5-32mda +++ b/acceptance/config/nodes/pe/scientific-5-32mda @@ -1,22 +1,22 @@ HOSTS: scientific-5-i386: roles: - master - dashboard - database - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-i386 + template: scientific-5-i386 hypervisor: vcloud scientific-5-i386-agent: roles: - agent platform: el-5-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-i386 + template: scientific-5-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da b/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da index 5881efd5a..7d4bf76fe 100644 --- a/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da +++ b/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: scientific-5-x86_64-master: roles: - master - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-x86_64 + template: scientific-5-x86_64 hypervisor: vcloud scientific-5-x86_64-dashboard: roles: - dashboard - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-x86_64 + template: scientific-5-x86_64 hypervisor: vcloud scientific-5-x86_64-database: roles: - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-x86_64 + template: scientific-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-64mda b/acceptance/config/nodes/pe/scientific-5-64mda index 0906b1c4b..0867ac720 100644 --- a/acceptance/config/nodes/pe/scientific-5-64mda +++ b/acceptance/config/nodes/pe/scientific-5-64mda @@ -1,22 +1,22 @@ HOSTS: scientific-5-x86_64: roles: - master - dashboard - database - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-x86_64 + template: scientific-5-x86_64 hypervisor: vcloud scientific-5-x86_64-agent: roles: - agent platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-5-x86_64 + template: scientific-5-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da b/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da index 9c49d8ac5..f39aa10a0 100644 --- a/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da +++ b/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: scientific-6-i386-master: roles: - master - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-i386 + template: scientific-6-i386 hypervisor: vcloud scientific-6-i386-dashboard: roles: - dashboard - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-i386 + template: scientific-6-i386 hypervisor: vcloud scientific-6-i386-database: roles: - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-i386 + template: scientific-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-32mda b/acceptance/config/nodes/pe/scientific-6-32mda index 7bcc8bcf9..e28e6ac94 100644 --- a/acceptance/config/nodes/pe/scientific-6-32mda +++ b/acceptance/config/nodes/pe/scientific-6-32mda @@ -1,22 +1,22 @@ HOSTS: scientific-6-i386: roles: - master - dashboard - database - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-i386 + template: scientific-6-i386 hypervisor: vcloud scientific-6-i386-agent: roles: - agent platform: el-6-i386 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-i386 + template: scientific-6-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da b/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da index fe4eadaf0..c45c3affd 100644 --- a/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da +++ b/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: scientific-6-x86_64-master: roles: - master - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-x86_64 + template: scientific-6-x86_64 hypervisor: vcloud scientific-6-x86_64-dashboard: roles: - dashboard - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-x86_64 + template: scientific-6-x86_64 hypervisor: vcloud scientific-6-x86_64-database: roles: - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-x86_64 + template: scientific-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-64mda b/acceptance/config/nodes/pe/scientific-6-64mda index 4279e9f00..6ad577dd8 100644 --- a/acceptance/config/nodes/pe/scientific-6-64mda +++ b/acceptance/config/nodes/pe/scientific-6-64mda @@ -1,22 +1,22 @@ HOSTS: scientific-6-x86_64: roles: - master - dashboard - database - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-x86_64 + template: scientific-6-x86_64 hypervisor: vcloud scientific-6-x86_64-agent: roles: - agent platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/scientific-6-x86_64 + template: scientific-6-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-32ma-32da-32da b/acceptance/config/nodes/pe/sles-11-32ma-32da-32da index dd2e53017..83e54654b 100644 --- a/acceptance/config/nodes/pe/sles-11-32ma-32da-32da +++ b/acceptance/config/nodes/pe/sles-11-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: sles-11-i386-master: roles: - master - agent platform: sles-11-i386 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-i386 + template: sles-11-i386 hypervisor: vcloud sles-11-i386-dashboard: roles: - dashboard - agent platform: sles-11-i386 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-i386 + template: sles-11-i386 hypervisor: vcloud sles-11-i386-database: roles: - database - agent platform: sles-11-i386 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-i386 + template: sles-11-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-32mda b/acceptance/config/nodes/pe/sles-11-32mda index 4e1bd4f9f..ab028262f 100644 --- a/acceptance/config/nodes/pe/sles-11-32mda +++ b/acceptance/config/nodes/pe/sles-11-32mda @@ -1,22 +1,22 @@ HOSTS: sles-11-i386: roles: - master - dashboard - database - agent platform: sles-11-i386 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-i386 + template: sles-11-i386 hypervisor: vcloud sles-11-i386-agent: roles: - agent platform: sles-11-i386 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-i386 + template: sles-11-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-64ma-64da-64da b/acceptance/config/nodes/pe/sles-11-64ma-64da-64da index 8efbd0bc0..4490469cc 100644 --- a/acceptance/config/nodes/pe/sles-11-64ma-64da-64da +++ b/acceptance/config/nodes/pe/sles-11-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: sles-11-x86_64-master: roles: - master - agent platform: sles-11-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64 + template: sles-11-x86_64 hypervisor: vcloud sles-11-x86_64-dashboard: roles: - dashboard - agent platform: sles-11-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64 + template: sles-11-x86_64 hypervisor: vcloud sles-11-x86_64-database: roles: - database - agent platform: sles-11-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64 + template: sles-11-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-64mda b/acceptance/config/nodes/pe/sles-11-64mda index fd2024280..6ba41e34b 100644 --- a/acceptance/config/nodes/pe/sles-11-64mda +++ b/acceptance/config/nodes/pe/sles-11-64mda @@ -1,22 +1,22 @@ HOSTS: sles-11-x86_64: roles: - master - dashboard - database - agent platform: sles-11-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64 + template: sles-11-x86_64 hypervisor: vcloud sles-11-x86_64-agent: roles: - agent platform: sles-11-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64 + template: sles-11-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da b/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da index 043ba6407..f06acf563 100644 --- a/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da +++ b/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: ubuntu-1004-i386-master: roles: - master - agent platform: ubuntu-10.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 hypervisor: vcloud ubuntu-1004-i386-dashboard: roles: - dashboard - agent platform: ubuntu-10.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 hypervisor: vcloud ubuntu-1004-i386-database: roles: - database - agent platform: ubuntu-10.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-32mda b/acceptance/config/nodes/pe/ubuntu-1004-32mda index 875b363db..420904873 100644 --- a/acceptance/config/nodes/pe/ubuntu-1004-32mda +++ b/acceptance/config/nodes/pe/ubuntu-1004-32mda @@ -1,22 +1,22 @@ HOSTS: ubuntu-1004-i386: roles: - master - dashboard - database - agent platform: ubuntu-10.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 hypervisor: vcloud ubuntu-1004-agent: roles: - agent platform: ubuntu-10.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da b/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da index d8c271f2b..f3e1824d5 100644 --- a/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da +++ b/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: ubuntu-1004-amd64-master: roles: - master - agent platform: ubuntu-10.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64 + template: ubuntu-1004-x86_64 hypervisor: vcloud ubuntu-1004-amd64-dashboard: roles: - dashboard - agent platform: ubuntu-10.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64 + template: ubuntu-1004-x86_64 hypervisor: vcloud ubuntu-1004-amd64-database: roles: - database - agent platform: ubuntu-10.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64 + template: ubuntu-1004-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-64mda b/acceptance/config/nodes/pe/ubuntu-1004-64mda index 9dd2982ad..d0be005c7 100644 --- a/acceptance/config/nodes/pe/ubuntu-1004-64mda +++ b/acceptance/config/nodes/pe/ubuntu-1004-64mda @@ -1,22 +1,22 @@ HOSTS: ubuntu-1004-amd64: roles: - master - dashboard - database - agent platform: ubuntu-10.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64 + template: ubuntu-1004-x86_64 hypervisor: vcloud ubuntu-1004-agent: roles: - agent platform: ubuntu-10.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64 + template: ubuntu-1004-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da b/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da index 8a9d484a0..40519c353 100644 --- a/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da +++ b/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da @@ -1,28 +1,28 @@ HOSTS: ubuntu-1204-i386-master: roles: - master - agent platform: ubuntu-12.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386 + template: ubuntu-1204-i386 hypervisor: vcloud ubuntu-1204-i386-dashboard: roles: - dashboard - agent platform: ubuntu-12.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386 + template: ubuntu-1204-i386 hypervisor: vcloud ubuntu-1204-i386-database: roles: - database - agent platform: ubuntu-12.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386 + template: ubuntu-1204-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-32mda b/acceptance/config/nodes/pe/ubuntu-1204-32mda index 381003eb9..79ec14211 100644 --- a/acceptance/config/nodes/pe/ubuntu-1204-32mda +++ b/acceptance/config/nodes/pe/ubuntu-1204-32mda @@ -1,22 +1,22 @@ HOSTS: ubuntu-1204-i386: roles: - master - dashboard - database - agent platform: ubuntu-12.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386 + template: ubuntu-1204-i386 hypervisor: vcloud ubuntu-1204-agent: roles: - agent platform: ubuntu-12.04-i386 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386 + template: ubuntu-1204-i386 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da b/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da index bf5e34841..8e87ac854 100644 --- a/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da +++ b/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da @@ -1,28 +1,28 @@ HOSTS: ubuntu-1204-amd64-master: roles: - master - agent platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 hypervisor: vcloud ubuntu-1204-amd64-dashboard: roles: - dashboard - agent platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 hypervisor: vcloud ubuntu-1204-amd64-database: roles: - database - agent platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-64mda b/acceptance/config/nodes/pe/ubuntu-1204-64mda index 8e8cda971..9379fa8f4 100644 --- a/acceptance/config/nodes/pe/ubuntu-1204-64mda +++ b/acceptance/config/nodes/pe/ubuntu-1204-64mda @@ -1,22 +1,22 @@ HOSTS: ubuntu-1204-amd64: roles: - master - dashboard - database - agent platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 hypervisor: vcloud ubuntu-1204-agent: roles: - agent platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 hypervisor: vcloud CONFIG: nfs_server: none consoleport: 443 datastore: instance0 folder: Delivery/Quality Assurance/Enterprise/Dynamic resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/precise.yaml b/acceptance/config/nodes/precise.yaml index 22793b50a..1a62d4055 100644 --- a/acceptance/config/nodes/precise.yaml +++ b/acceptance/config/nodes/precise.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: ubuntu-precise-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 agent: roles: - agent platform: ubuntu-precise-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386 + template: ubuntu-1204-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/precise_and_lucid.yaml b/acceptance/config/nodes/precise_and_lucid.yaml index bd7dfeb33..df4f928b5 100644 --- a/acceptance/config/nodes/precise_and_lucid.yaml +++ b/acceptance/config/nodes/precise_and_lucid.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: ubuntu-precise-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 + template: ubuntu-1204-x86_64 agent: roles: - agent platform: ubuntu-lucid-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386 + template: ubuntu-1004-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/rhel5.yaml b/acceptance/config/nodes/rhel5.yaml index 61aa05d10..0d4ab2a24 100644 --- a/acceptance/config/nodes/rhel5.yaml +++ b/acceptance/config/nodes/rhel5.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: el-5-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-x86_64 + template: redhat-5-x86_64 agent: roles: - agent platform: el-5-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/rhel6.yaml b/acceptance/config/nodes/rhel6.yaml index 6a1d1c1f7..4b89ab6e6 100644 --- a/acceptance/config/nodes/rhel6.yaml +++ b/acceptance/config/nodes/rhel6.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 agent: roles: - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/rhel6_and_rhel5.yaml b/acceptance/config/nodes/rhel6_and_rhel5.yaml index 8fedef6e2..f3f9730cf 100644 --- a/acceptance/config/nodes/rhel6_and_rhel5.yaml +++ b/acceptance/config/nodes/rhel6_and_rhel5.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64 + template: redhat-6-x86_64 agent: roles: - agent platform: el-5-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-5-i386 + template: redhat-5-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/rhel7.yaml b/acceptance/config/nodes/rhel7.yaml index b5706dd47..700d1eb6b 100644 --- a/acceptance/config/nodes/rhel7.yaml +++ b/acceptance/config/nodes/rhel7.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: el-7-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-7-x86_64 + template: redhat-7-x86_64 agent: roles: - agent platform: el-7-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-7-x86_64 + template: redhat-7-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/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/solaris10.yaml b/acceptance/config/nodes/solaris10.yaml index d35c4bbab..caa8c7020 100644 --- a/acceptance/config/nodes/solaris10.yaml +++ b/acceptance/config/nodes/solaris10.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: solaris-10-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/solaris-10-x86_64 + template: solaris-10-x86_64 agent: roles: - agent platform: solaris-10-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/solaris-10-x86_64 + template: solaris-10-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/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/solaris11.yaml b/acceptance/config/nodes/solaris11.yaml index 0cfbd9260..6af146a2e 100644 --- a/acceptance/config/nodes/solaris11.yaml +++ b/acceptance/config/nodes/solaris11.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: solaris-11-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/solaris-11-x86_64 + template: solaris-11-x86_64 agent: roles: - agent platform: solaris-11-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/solaris-11-x86_64 + template: solaris-11-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/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/squeeze.yaml b/acceptance/config/nodes/squeeze.yaml index d78609f58..6b98170d8 100644 --- a/acceptance/config/nodes/squeeze.yaml +++ b/acceptance/config/nodes/squeeze.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: debian-squeeze-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64 + template: debian-6-x86_64 agent: roles: - agent platform: debian-squeeze-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386 + template: debian-6-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/standalone/rhel6-and-precise.yaml b/acceptance/config/nodes/standalone/rhel6-and-precise.yaml index 4aa330c6b..06358855a 100644 --- a/acceptance/config/nodes/standalone/rhel6-and-precise.yaml +++ b/acceptance/config/nodes/standalone/rhel6-and-precise.yaml @@ -1,14 +1,13 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 ip: 192.168.40.12 agent1: roles: - agent platform: ubuntu-12.04-i386 ip: 192.168.40.10 CONFIG: - filecount: 12 diff --git a/acceptance/config/nodes/trusty.yaml b/acceptance/config/nodes/trusty.yaml index 45001c615..007feb622 100644 --- a/acceptance/config/nodes/trusty.yaml +++ b/acceptance/config/nodes/trusty.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: ubuntu-trusty-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64 + template: ubuntu-1404-x86_64 agent: roles: - agent platform: ubuntu-trusty-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-i386 + template: ubuntu-1404-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/wheezy.yaml b/acceptance/config/nodes/wheezy.yaml index e805be655..b1a1a05e5 100644 --- a/acceptance/config/nodes/wheezy.yaml +++ b/acceptance/config/nodes/wheezy.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - agent platform: debian-wheezy-x86_64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64 + template: debian-7-x86_64 agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386 + template: debian-7-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2x64-rubyx64.yaml b/acceptance/config/nodes/win2003r2x64-rubyx64.yaml index 5a94aab24..d808af883 100644 --- a/acceptance/config/nodes/win2003r2x64-rubyx64.yaml +++ b/acceptance/config/nodes/win2003r2x64-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2003r2-x86_64-rubyx64: roles: - agent platform: windows-2003r2-64 ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64 + template: win-2003r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2x64-rubyx86.yaml b/acceptance/config/nodes/win2003r2x64-rubyx86.yaml index d58429524..482134557 100644 --- a/acceptance/config/nodes/win2003r2x64-rubyx86.yaml +++ b/acceptance/config/nodes/win2003r2x64-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2003r2-x86_64-rubyx86: roles: - agent platform: windows-2003r2-64 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64 + template: win-2003r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2x86-rubyx86.yaml b/acceptance/config/nodes/win2003r2x86-rubyx86.yaml index d91bc7385..d82282e2b 100644 --- a/acceptance/config/nodes/win2003r2x86-rubyx86.yaml +++ b/acceptance/config/nodes/win2003r2x86-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2003r2-i386: roles: - agent platform: windows-2003r2-32 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386 + template: win-2003r2-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003x64-rubyx64.yaml b/acceptance/config/nodes/win2003x64-rubyx64.yaml index 4f6f0754e..b480a97e3 100644 --- a/acceptance/config/nodes/win2003x64-rubyx64.yaml +++ b/acceptance/config/nodes/win2003x64-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2003-x86_64-rubyx64: roles: - agent platform: windows-2003-64 ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64 + template: win-2003-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003x64-rubyx86.yaml b/acceptance/config/nodes/win2003x64-rubyx86.yaml index 5929ab47d..20f795f0e 100644 --- a/acceptance/config/nodes/win2003x64-rubyx86.yaml +++ b/acceptance/config/nodes/win2003x64-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2003-x86_64-rubyx86: roles: - agent platform: windows-2003-64 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64 + template: win-2003-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003x86-rubyx86.yaml b/acceptance/config/nodes/win2003x86-rubyx86.yaml index b558a5514..9051de954 100644 --- a/acceptance/config/nodes/win2003x86-rubyx86.yaml +++ b/acceptance/config/nodes/win2003x86-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2003-i386: roles: - agent platform: windows-2003-32 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386 + template: win-2003-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008-rubyx64.yaml b/acceptance/config/nodes/win2008-rubyx64.yaml index 0892d7931..3d240427d 100644 --- a/acceptance/config/nodes/win2008-rubyx64.yaml +++ b/acceptance/config/nodes/win2008-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2008-x86_64-rubyx64: roles: - agent platform: windows-2008-64 ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64 + template: win-2008-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008-rubyx86.yaml b/acceptance/config/nodes/win2008-rubyx86.yaml index 5de98710b..67687cee4 100644 --- a/acceptance/config/nodes/win2008-rubyx86.yaml +++ b/acceptance/config/nodes/win2008-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2008-x86_64-rubyx86: roles: - agent platform: windows-2008-64 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64 + template: win-2008-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2-rubyx64.yaml b/acceptance/config/nodes/win2008r2-rubyx64.yaml index 3de3f5db1..a284f8271 100644 --- a/acceptance/config/nodes/win2008r2-rubyx64.yaml +++ b/acceptance/config/nodes/win2008r2-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2008r2-x86_64-rubyx64: roles: - agent platform: windows-2008r2-64 ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: win-2008r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2-rubyx86.yaml b/acceptance/config/nodes/win2008r2-rubyx86.yaml index 2020cc6c6..bc2fdd666 100644 --- a/acceptance/config/nodes/win2008r2-rubyx86.yaml +++ b/acceptance/config/nodes/win2008r2-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2008r2-x86_64-rubyx86: roles: - agent platform: windows-2008r2-64 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: win-2008r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012-rubyx64.yaml b/acceptance/config/nodes/win2012-rubyx64.yaml index 73b8488a1..bb7528b15 100644 --- a/acceptance/config/nodes/win2012-rubyx64.yaml +++ b/acceptance/config/nodes/win2012-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2012-x86_64-rubyx64: roles: - agent platform: windows-2012-64 ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64 + template: win-2012-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012-rubyx86.yaml b/acceptance/config/nodes/win2012-rubyx86.yaml index 9e18b234e..92240b275 100644 --- a/acceptance/config/nodes/win2012-rubyx86.yaml +++ b/acceptance/config/nodes/win2012-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2012-x86_64-rubyx86: roles: - agent platform: windows-2012-64 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64 + template: win-2012-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012r2-rubyx64.yaml b/acceptance/config/nodes/win2012r2-rubyx64.yaml index 59c35f4b9..ad58a148c 100644 --- a/acceptance/config/nodes/win2012r2-rubyx64.yaml +++ b/acceptance/config/nodes/win2012r2-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2012r2-x86_64-rubyx64: roles: - agent platform: windows-2012r2-64 ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64 + template: win-2012r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012r2-rubyx86.yaml b/acceptance/config/nodes/win2012r2-rubyx86.yaml index 2ebb2dc71..912e9badb 100644 --- a/acceptance/config/nodes/win2012r2-rubyx86.yaml +++ b/acceptance/config/nodes/win2012r2-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 + template: redhat-6-i386 agent-2012r2-x86_64-rubyx86: roles: - agent platform: windows-2012r2-64 ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64 + template: win-2012r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ + pooling_api: http://vmpooler.delivery.puppetlabs.net/