opuppet/module-puppetdb
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adjust memory for PuppetDB tests to avoid OOM killer

Browse source 
The tests were failing on Ubuntu, and I noticed that the OOM killer
was killing java. This patch increases the memory size for each
image to avoid this.

Signed-off-by: Ken Barber <ken@bob.sh>
This commit is contained in:
Ken Barber 2013-10-27 00:52:18 +02:00
parent 683bda3e3e
commit c29fb59a68
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.nodeset.yml
View file

@ -5,27 +5,41 @@ sets:
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'centos-59-x64' prefab: 'centos-59-x64'
options:
memory: 1024 #mb
'centos-64-x64': 'centos-64-x64':
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'centos-64-x64' prefab: 'centos-64-x64'
options:
memory: 1024 #mb
'fedora-18-x64': 'fedora-18-x64':
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'fedora-18-x64' prefab: 'fedora-18-x64'
options:
memory: 1024 #mb
'debian-607-x64': 'debian-607-x64':
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'debian-607-x64' prefab: 'debian-607-x64'
options:
memory: 1024 #mb
'debian-70rc1-x64': 'debian-70rc1-x64':
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'debian-70rc1-x64' prefab: 'debian-70rc1-x64'
options:
memory: 1024 #mb
'ubuntu-server-10044-x64': 'ubuntu-server-10044-x64':
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'ubuntu-server-10044-x64' prefab: 'ubuntu-server-10044-x64'
options:
memory: 1024 #mb
'ubuntu-server-12042-x64': 'ubuntu-server-12042-x64':
nodes: nodes:
"main.foo.vm": "main.foo.vm":
prefab: 'ubuntu-server-12042-x64' prefab: 'ubuntu-server-12042-x64'
options:
memory: 1024 #mb

1
manifests/server.pp
View file

@ -133,7 +133,6 @@ class puppetdb::server(
service { $puppetdb_service: service { $puppetdb_service:
ensure => $puppetdb_service_status, ensure => $puppetdb_service_status,
enable => $service_enabled, enable => $service_enabled,
} }
Package[$puppetdb_package] -> Package[$puppetdb_package] ->