Merge pull request #278 from cyberious/4.3.x

Add windows Nodesets and remove Beaker from Gemfile
This commit is contained in:
Morgan Haskel 2014-06-20 19:40:26 -04:00
commit 3ec3a4b0fa
7 changed files with 156 additions and 1 deletions

View file

@ -18,7 +18,6 @@ group :development, :test do
gem 'puppet-lint', :require => false
gem 'pry', :require => false
gem 'simplecov', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
end

View file

@ -0,0 +1,26 @@
HOSTS:
ubuntu1204:
roles:
- master
- database
- dashboard
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vcloud
win2003_i386:
roles:
- agent
- default
platform: windows-2003-i386
template: win-2003-i386
hypervisor: vcloud
CONFIG:
nfs_server: none
ssh:
keys: "~/.ssh/id_rsa-acceptance"
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/

View file

@ -0,0 +1,26 @@
HOSTS:
ubuntu1204:
roles:
- master
- database
- dashboard
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vcloud
win2003_x86_64:
roles:
- agent
- default
platform: windows-2003-x86_64
template: win-2003-x86_64
hypervisor: vcloud
CONFIG:
nfs_server: none
ssh:
keys: "~/.ssh/id_rsa-acceptance"
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/

View file

@ -0,0 +1,26 @@
HOSTS:
ubuntu1204:
roles:
- master
- database
- dashboard
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vcloud
win2008_x86_64:
roles:
- agent
- default
platform: windows-2008-x86_64
template: win-2008-x86_64
hypervisor: vcloud
CONFIG:
nfs_server: none
ssh:
keys: "~/.ssh/id_rsa-acceptance"
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/

View file

@ -0,0 +1,26 @@
HOSTS:
ubuntu1204:
roles:
- master
- database
- dashboard
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vcloud
win2008r2:
roles:
- agent
- default
platform: windows-2008r2-x86_64
template: win-2008r2-x86_64
hypervisor: vcloud
CONFIG:
nfs_server: none
ssh:
keys: "~/.ssh/id_rsa-acceptance"
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/

View file

@ -0,0 +1,26 @@
HOSTS:
ubuntu1204:
roles:
- master
- database
- dashboard
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vcloud
win2012:
roles:
- agent
- default
platform: windows-2012-x86_64
template: win-2012-x86_64
hypervisor: vcloud
CONFIG:
nfs_server: none
ssh:
keys: "~/.ssh/id_rsa-acceptance"
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/

View file

@ -0,0 +1,26 @@
HOSTS:
ubuntu1204:
roles:
- master
- database
- dashboard
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vcloud
win2012r2:
roles:
- agent
- default
platform: windows-2012r2-x86_64
template: win-2012r2-x86_64
hypervisor: vcloud
CONFIG:
nfs_server: none
ssh:
keys: "~/.ssh/id_rsa-acceptance"
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/