From f8234695147c56eeebff9eee88abbeb3db537b6c Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 4 Jul 2013 21:09:56 +0000 Subject: [PATCH] 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 Reviewed-by: James E. Blair Reviewed-by: Elizabeth Krumbach Joseph Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- modules/jenkins/templates/cgconfig.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jenkins/templates/cgconfig.erb b/modules/jenkins/templates/cgconfig.erb index 3b88807d59..055c225d6b 100644 --- a/modules/jenkins/templates/cgconfig.erb +++ b/modules/jenkins/templates/cgconfig.erb @@ -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 %>