Skip to content

Commit

Permalink
Merge pull request redhat-openstack#278 from cyberious/4.3.x
Browse files Browse the repository at this point in the history
Add windows Nodesets and remove Beaker from Gemfile
  • Loading branch information
Morgan Haskel committed Jun 20, 2014
2 parents c634e47 + 24a6fec commit 3ec3a4b
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 1 deletion.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/windows-2003-i386.yml
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/windows-2003-x86_64.yml
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/windows-2008-x86_64.yml
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/windows-2008r2-x86_64.yml
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/windows-2012-x86_64.yml
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/windows-2012r2-x86_64.yml
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 3ec3a4b

Please sign in to comment.