opendev
/
puppet-jenkins
Code Issues Proposed changes

Fix cgconfig.conf comments. 

* modules/jenkins/templates/cgconfig.erb: The cgconfig service does
not handle comment lines and fails to start. There is little benefit
to embedding comments into the resulting configuration file anyway,
so instead just make them ruby comments within the template.

Change-Id: Ie749acfcd231560094137e82e048726d04944b4e
Reviewed-on: https://review.openstack.org/35715
Reviewed-by: Khai Do <zaro0508@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-07-04 21:09:56 +00:00 committed by Jenkins
parent 390e141ddb
commit f8d6594927
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/cgconfig.erb
View File

@ -1,6 +1,6 @@
<% if operatingsystem == "Fedora" then %>
<% if operatingsystem == "Fedora" then
# Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no
# mount section is needed.
# mount section is needed. %>
<% elsif osfamily == "RedHat" then %>
mount {
@ -51,9 +51,9 @@ group jenkins/children {
memory {
memory.soft_limit_in_bytes = <%= (memorytotalbytes.to_f * 0.75).to_i %>;
memory.limit_in_bytes = <%= (memorytotalbytes.to_f * 0.9).to_i %>;
<% if (operatingsystem == "Fedora") and (operatingsystemrelease == "18") then %>
<% 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.
# work in Fedora 18 but should be fixed in 19. %>
<% else %>
memory.memsw.limit_in_bytes = <%= (memorytotalbytes.to_f * 0.9).to_i %>;
<% end %>