diff --git a/acceptance/config/nodes/solaris10.yaml b/acceptance/config/nodes/solaris10.yaml index 64a3f1aa9..60818028e 100644 --- a/acceptance/config/nodes/solaris10.yaml +++ b/acceptance/config/nodes/solaris10.yaml @@ -1,19 +1,18 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent: roles: - agent platform: solaris-10-x86_64 hypervisor: vcloud template: solaris-10-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/solaris11.yaml b/acceptance/config/nodes/solaris11.yaml index fa107650f..97d118921 100644 --- a/acceptance/config/nodes/solaris11.yaml +++ b/acceptance/config/nodes/solaris11.yaml @@ -1,19 +1,18 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent: roles: - agent platform: solaris-11-x86_64 hypervisor: vcloud template: solaris-11-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2x64-rubyx64.yaml b/acceptance/config/nodes/win2003r2x64-rubyx64.yaml index 45ff1932e..89ce5901f 100644 --- a/acceptance/config/nodes/win2003r2x64-rubyx64.yaml +++ b/acceptance/config/nodes/win2003r2x64-rubyx64.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2003r2-x86_64-rubyx64: roles: - agent platform: windows-2003r2-64 ruby_arch: x64 hypervisor: vcloud template: win-2003r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2x64-rubyx86.yaml b/acceptance/config/nodes/win2003r2x64-rubyx86.yaml index cdc2bdaaf..a32d37a3c 100644 --- a/acceptance/config/nodes/win2003r2x64-rubyx86.yaml +++ b/acceptance/config/nodes/win2003r2x64-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2003r2-x86_64-rubyx86: roles: - agent platform: windows-2003r2-64 ruby_arch: x86 hypervisor: vcloud template: win-2003r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2x86-rubyx86.yaml b/acceptance/config/nodes/win2003r2x86-rubyx86.yaml index e2c1c3d70..7a1a689ca 100644 --- a/acceptance/config/nodes/win2003r2x86-rubyx86.yaml +++ b/acceptance/config/nodes/win2003r2x86-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2003r2-i386: roles: - agent platform: windows-2003r2-32 ruby_arch: x86 hypervisor: vcloud template: win-2003r2-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003x64-rubyx64.yaml b/acceptance/config/nodes/win2003x64-rubyx64.yaml index d2d40719d..a389b0dee 100644 --- a/acceptance/config/nodes/win2003x64-rubyx64.yaml +++ b/acceptance/config/nodes/win2003x64-rubyx64.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2003-x86_64-rubyx64: roles: - agent platform: windows-2003-64 ruby_arch: x64 hypervisor: vcloud template: win-2003-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003x64-rubyx86.yaml b/acceptance/config/nodes/win2003x64-rubyx86.yaml index a49e9205b..75b56d5a6 100644 --- a/acceptance/config/nodes/win2003x64-rubyx86.yaml +++ b/acceptance/config/nodes/win2003x64-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2003-x86_64-rubyx86: roles: - agent platform: windows-2003-64 ruby_arch: x86 hypervisor: vcloud template: win-2003-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003x86-rubyx86.yaml b/acceptance/config/nodes/win2003x86-rubyx86.yaml index 0033387e8..c4785042d 100644 --- a/acceptance/config/nodes/win2003x86-rubyx86.yaml +++ b/acceptance/config/nodes/win2003x86-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2003-i386: roles: - agent platform: windows-2003-32 ruby_arch: x86 hypervisor: vcloud template: win-2003-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008-rubyx64.yaml b/acceptance/config/nodes/win2008-rubyx64.yaml index f68956bad..622e29d55 100644 --- a/acceptance/config/nodes/win2008-rubyx64.yaml +++ b/acceptance/config/nodes/win2008-rubyx64.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2008-x86_64-rubyx64: roles: - agent platform: windows-2008-64 ruby_arch: x64 hypervisor: vcloud template: win-2008-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008-rubyx86.yaml b/acceptance/config/nodes/win2008-rubyx86.yaml index 61bda0157..4470cd318 100644 --- a/acceptance/config/nodes/win2008-rubyx86.yaml +++ b/acceptance/config/nodes/win2008-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2008-x86_64-rubyx86: roles: - agent platform: windows-2008-64 ruby_arch: x86 hypervisor: vcloud template: win-2008-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2-rubyx64.yaml b/acceptance/config/nodes/win2008r2-rubyx64.yaml index 63839eaa7..aec2880f0 100644 --- a/acceptance/config/nodes/win2008r2-rubyx64.yaml +++ b/acceptance/config/nodes/win2008r2-rubyx64.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2008r2-x86_64-rubyx64: roles: - agent platform: windows-2008r2-64 ruby_arch: x64 hypervisor: vcloud template: win-2008r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2-rubyx86.yaml b/acceptance/config/nodes/win2008r2-rubyx86.yaml index 4e704c227..7fce53f98 100644 --- a/acceptance/config/nodes/win2008r2-rubyx86.yaml +++ b/acceptance/config/nodes/win2008r2-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2008r2-x86_64-rubyx86: roles: - agent platform: windows-2008r2-64 ruby_arch: x86 hypervisor: vcloud template: win-2008r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012-rubyx64.yaml b/acceptance/config/nodes/win2012-rubyx64.yaml index 383688aa6..cfe28c78e 100644 --- a/acceptance/config/nodes/win2012-rubyx64.yaml +++ b/acceptance/config/nodes/win2012-rubyx64.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2012-x86_64-rubyx64: roles: - agent platform: windows-2012-64 ruby_arch: x64 hypervisor: vcloud template: win-2012-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012-rubyx86.yaml b/acceptance/config/nodes/win2012-rubyx86.yaml index 4d4181ecb..07998381a 100644 --- a/acceptance/config/nodes/win2012-rubyx86.yaml +++ b/acceptance/config/nodes/win2012-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2012-x86_64-rubyx86: roles: - agent platform: windows-2012-64 ruby_arch: x86 hypervisor: vcloud template: win-2012-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012r2-rubyx64.yaml b/acceptance/config/nodes/win2012r2-rubyx64.yaml index 7408102b7..958b1e5bc 100644 --- a/acceptance/config/nodes/win2012r2-rubyx64.yaml +++ b/acceptance/config/nodes/win2012r2-rubyx64.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2012r2-x86_64-rubyx64: roles: - agent platform: windows-2012r2-64 ruby_arch: x64 hypervisor: vcloud template: win-2012r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012r2-rubyx86.yaml b/acceptance/config/nodes/win2012r2-rubyx86.yaml index 9d5dd224e..84b8474a5 100644 --- a/acceptance/config/nodes/win2012r2-rubyx86.yaml +++ b/acceptance/config/nodes/win2012r2-rubyx86.yaml @@ -1,20 +1,19 @@ HOSTS: master: roles: - master - - agent platform: el-7-x86_64 hypervisor: vcloud template: redhat-7-x86_64 agent-2012r2-x86_64-rubyx86: roles: - agent platform: windows-2012r2-64 ruby_arch: x86 hypervisor: vcloud template: win-2012r2-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/