opendev/puppet-jenkins
Code Issues Proposed changes

Use @varname to supress warnings

Browse Source 
Change-Id: Ida6c3a8df348bd8c33f0b6caea3d71edea147b7d
This commit is contained in:
Spencer Krum 2015-03-11 17:12:23 -07:00
parent 873f8163c9
commit cf9bcbadf1
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
templates/cgconfig.erb
View File

@ -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;
@ -25,37 +25,37 @@ mount {
<% end %>
group jenkins {
perm {
task {
uid = jenkins;
gid = jenkins;
}
admin {
uid = root;
gid = root;
}
}
perm {
task {
uid = jenkins;
gid = jenkins;
}
admin {
uid = root;
gid = root;
}
}
}
group jenkins/children {
perm {
task {
uid = jenkins;
gid = jenkins;
}
admin {
uid = root;
gid = root;
}
}
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
# Because of Red Hat bug 918951, swap management doesn't
# work in Fedora 18 but should be fixed in 19. %>
perm {
task {
uid = jenkins;
gid = jenkins;
}
admin {
uid = root;
gid = root;
}
}
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
# 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 %>
}
}
}

6
templates/jenkins_jobs.ini.erb
View File

@ -1,4 +1,4 @@
[jenkins]
user=<%= username %>
password=<%= password %>
url=<%= url %>
user=<%= @username %>
password=<%= @password %>
url=<%= @url %>

2
templates/openstack.js.erb
View File

@ -10,7 +10,7 @@ function makeDoubleDelegate(function1, function2) {
function chgeLogo() {
var imgs=document.getElementsByTagName("img");
var imgTag = document.createElement("img");
imgTag.setAttribute("src","https://<%= vhost_name %>/plugin/simple-theme-plugin/title.png");
imgTag.setAttribute("src","https://<%= @vhost_name %>/plugin/simple-theme-plugin/title.png");
imgTag.setAttribute("style", "vertical-align: middle;padding-left: 0.75em;");
imgs[0].parentNode.appendChild(imgTag);
var spanTag = document.createElement("span");