Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/jar 2.44.0 #31

Merged
merged 2 commits into from
Jan 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
$hub_options = '-role hub'
$node_options = "${server_options} -role node"
$java = 'java'
$version = '2.42.1'
$version = '2.44.0'
$default_hub = 'http://localhost:4444/grid/register'
$download_timeout = '90'

Expand Down
19 changes: 19 additions & 0 deletions spec/acceptance/nodesets/aix-71-vcloud.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
HOSTS:
pe-aix-71-acceptance:
roles:
- master
- dashboard
- database
- agent
- default
platform: aix-7.1-power
hypervisor: aix
ip: pe-aix-71-acceptance.delivery.puppetlabs.net
CONFIG:
type: pe
nfs_server: NONE
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/centos-64-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
type: git
10 changes: 10 additions & 0 deletions spec/acceptance/nodesets/centos-65-x64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
HOSTS:
centos-65-x64:
roles:
- master
platform: el-6-x86_64
box : centos-65-x64-vbox436-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
10 changes: 10 additions & 0 deletions spec/acceptance/nodesets/centos-70-x64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
HOSTS:
centos-70-x64:
roles:
- master
platform: el-7-x86_64
box : puppetlabs/centos-7.0-64-nocm
box_url : https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm
hypervisor : vagrant
CONFIG:
type: foss
8 changes: 4 additions & 4 deletions spec/acceptance/nodesets/default.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
HOSTS:
centos-65-x64.localdomain:
centos-64-x64:
roles:
- master
platform: el-6-x86_64
box : centos-65-x64-virtualbox-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
box : centos-64-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
type: git
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/fedora-18-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
type: git
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
type: git
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
type: git
2 changes: 1 addition & 1 deletion spec/spec_helper_common.rb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DEFAULT_VERSION = '2.42.1'
DEFAULT_VERSION = '2.44.0'