opendev
/
puppet-jenkins
Code Issues Proposed changes

Merge "Don't configure memory swap bytes on cgroups for Trusty"

This commit is contained in:
Jenkins 2015-11-10 07:24:13 +00:00 committed by Gerrit Code Review
parent 953fcaf25c 897209c899
commit a4992c55d6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/cgconfig.erb
View File

@ -54,6 +54,10 @@ group jenkins/children {
<% if (@operatingsystem == "Fedora") and (@operatingsystemrelease == "18") then
# Because of Red Hat bug 918951, swap management doesn't
# work in Fedora 18 but should be fixed in 19. %>
<% elsif (@operatingsystem == "Ubuntu") and (@lsbdistrelease == "14.04") then %>
# memory.memsw.limit_in_bytes is not supported on Trusty, setting this
# raises a 'setting not supported by kernel error'. Checked with upstream,
# they confirmed lack of support in several kernels, so we should skip it.
<% else %>
memory.memsw.limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.9).to_i %>;
<% end %>