Skip to content

Commit 5e73e73

Browse files
committed
Merge pull request redhat-openstack#111 from cyberious/1.1.x
Add windows support and testing nodesets
2 parents 29ffe09 + acc9f43 commit 5e73e73

7 files changed

Lines changed: 154 additions & 1 deletion
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu1204:
3+
roles:
4+
- master
5+
- database
6+
- dashboard
7+
platform: ubuntu-12.04-amd64
8+
template: ubuntu-1204-x86_64
9+
hypervisor: vcloud
10+
win2003_i386:
11+
roles:
12+
- agent
13+
- default
14+
platform: windows-2003-i386
15+
template: win-2003-i386
16+
hypervisor: vcloud
17+
CONFIG:
18+
nfs_server: none
19+
consoleport: 443
20+
datastore: instance0
21+
folder: Delivery/Quality Assurance/Enterprise/Dynamic
22+
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
23+
pooling_api: http://vcloud.delivery.puppetlabs.net/
24+
pe_dir: http://neptune.puppetlabs.lan/3.2/ci-ready/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu1204:
3+
roles:
4+
- master
5+
- database
6+
- dashboard
7+
platform: ubuntu-12.04-amd64
8+
template: ubuntu-1204-x86_64
9+
hypervisor: vcloud
10+
win2003r2_x86_64:
11+
roles:
12+
- agent
13+
- default
14+
platform: windows-2003r2-x86_64
15+
template: win-2003r2-x86_64
16+
hypervisor: vcloud
17+
CONFIG:
18+
nfs_server: none
19+
consoleport: 443
20+
datastore: instance0
21+
folder: Delivery/Quality Assurance/Enterprise/Dynamic
22+
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
23+
pooling_api: http://vcloud.delivery.puppetlabs.net/
24+
pe_dir: http://neptune.puppetlabs.lan/3.3/ci-ready/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu1204:
3+
roles:
4+
- master
5+
- database
6+
- dashboard
7+
platform: ubuntu-12.04-amd64
8+
template: ubuntu-1204-x86_64
9+
hypervisor: vcloud
10+
win2008_x86_64:
11+
roles:
12+
- agent
13+
- default
14+
platform: windows-2008-x86_64
15+
template: win-2008-x86_64
16+
hypervisor: vcloud
17+
CONFIG:
18+
nfs_server: none
19+
consoleport: 443
20+
datastore: instance0
21+
folder: Delivery/Quality Assurance/Enterprise/Dynamic
22+
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
23+
pooling_api: http://vcloud.delivery.puppetlabs.net/
24+
pe_dir: http://neptune.puppetlabs.lan/3.3/ci-ready/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu1204:
3+
roles:
4+
- master
5+
- database
6+
- dashboard
7+
platform: ubuntu-12.04-amd64
8+
template: ubuntu-1204-x86_64
9+
hypervisor: vcloud
10+
win2008r2:
11+
roles:
12+
- agent
13+
- default
14+
platform: windows-2008r2-x86_64
15+
template: win-2008r2-x86_64
16+
hypervisor: vcloud
17+
CONFIG:
18+
nfs_server: none
19+
consoleport: 443
20+
datastore: instance0
21+
folder: Delivery/Quality Assurance/Enterprise/Dynamic
22+
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
23+
pooling_api: http://vcloud.delivery.puppetlabs.net/
24+
pe_dir: http://neptune.puppetlabs.lan/3.3/ci-ready/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu1204:
3+
roles:
4+
- master
5+
- database
6+
- dashboard
7+
platform: ubuntu-12.04-amd64
8+
template: ubuntu-1204-x86_64
9+
hypervisor: vcloud
10+
win2012:
11+
roles:
12+
- agent
13+
- default
14+
platform: windows-2012-x86_64
15+
template: win-2012-x86_64
16+
hypervisor: vcloud
17+
CONFIG:
18+
nfs_server: none
19+
consoleport: 443
20+
datastore: instance0
21+
folder: Delivery/Quality Assurance/Enterprise/Dynamic
22+
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
23+
pooling_api: http://vcloud.delivery.puppetlabs.net/
24+
pe_dir: http://neptune.puppetlabs.lan/3.3/ci-ready/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu1204:
3+
roles:
4+
- master
5+
- database
6+
- dashboard
7+
platform: ubuntu-12.04-amd64
8+
template: ubuntu-1204-x86_64
9+
hypervisor: vcloud
10+
win2012r2:
11+
roles:
12+
- agent
13+
- default
14+
platform: windows-2012r2-x86_64
15+
template: win-2012r2-x86_64
16+
hypervisor: vcloud
17+
CONFIG:
18+
nfs_server: none
19+
consoleport: 443
20+
datastore: instance0
21+
folder: Delivery/Quality Assurance/Enterprise/Dynamic
22+
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
23+
pooling_api: http://vcloud.delivery.puppetlabs.net/
24+
pe_dir: http://neptune.puppetlabs.lan/3.3/ci-ready/

spec/spec_helper_acceptance.rb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,16 @@
2525
# Configure all nodes in nodeset
2626
c.before :suite do
2727
# Install module and dependencies
28-
puppet_module_install(:source => proj_root, :module_name => 'inifile')
28+
hosts.each do |host|
29+
if host['platform'] !~ /windows/i
30+
copy_root_module_to(host, :source => proj_root, :module_name => 'inifile')
31+
end
32+
end
33+
hosts.each do |host|
34+
if host['platform'] =~ /windows/i
35+
on host, puppet('plugin download')
36+
end
37+
end
2938
end
3039

3140
c.treat_symbols_as_metadata_keys_with_true_values = true

0 commit comments

Comments
 (0)