From 1c02305f7d31f951834a78e29be6391f18e9bcc7 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 2 Jul 2014 17:35:02 +0000 Subject: [PATCH] Revert "Fixing deprecation warnings" This reverts commit 82b9b59522928863ddadeacfec819e287303ef20. Change-Id: I746d7ae57802dc76618db9024a0cf94c43774c02 --- templates/cgconfig.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/cgconfig.erb b/templates/cgconfig.erb index 7fe0687..055c225 100644 --- a/templates/cgconfig.erb +++ b/templates/cgconfig.erb @@ -1,7 +1,7 @@ -<% if @operatingsystem == "Fedora" then +<% if operatingsystem == "Fedora" then # Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no # mount section is needed. %> -<% elsif @osfamily == "RedHat" then %> +<% elsif osfamily == "RedHat" then %> mount { cpuset = /cgroup/cpuset; @@ -14,7 +14,7 @@ mount { blkio = /cgroup/blkio; } -<% elsif ( @operatingsystemrelease < '12.10' ) or ( @operatingsystem != 'Ubuntu' ) then %> +<% elsif ( operatingsystemrelease < '12.10' ) or ( operatingsystem != 'Ubuntu' ) then %> mount { cpu = /sys/fs/cgroup/cpu; cpuacct = /sys/fs/cgroup/cpuacct; @@ -49,13 +49,13 @@ 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 + 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 # Because of Red Hat bug 918951, swap management doesn't # work in Fedora 18 but should be fixed in 19. %> <% else %> - memory.memsw.limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.9).to_i %>; + memory.memsw.limit_in_bytes = <%= (memorytotalbytes.to_f * 0.9).to_i %>; <% end %> } }