Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove unneccessary nested warden cgroup FS dance

Signed-off-by: David Varvel <dvarvel@pivotallabs.com>
  • Loading branch information...
commit c4ed9d30bd665ce6f9c27f7b1fdb8735eebd07c3 1 parent 77b8df9
@hiremaga hiremaga authored lvarvel committed
Showing with 0 additions and 14 deletions.
  1. +0 −14 warden/lib/warden/container/linux.rb
View
14 warden/lib/warden/container/linux.rb
@@ -225,20 +225,6 @@ def write_bind_mount_commands(request)
add_bind_mount(file, src_path, dst_path, mode)
end
end
-
- # for nested warden, we share the host's cgroup fs to contrainers using bind mount
- if Server.config.allow_nested_warden?
- tmp_warden_cgroup = File.join(container_path, "tmp", "warden", "cgroup")
- FileUtils.mkdir_p(tmp_warden_cgroup)
-
- # Bind-mount cgroups
- add_bind_mount(file, tmp_warden_cgroup, "/tmp/warden/cgroup", "rw")
-
- # for each subsystems, only pass the group of the current container instead of all groups, so that nested warder server will setup groups directly under parent container's hierarchy
- %w(cpu cpuacct devices memory).each do |subsystem|
- add_bind_mount(file, cgroup_path(subsystem), "/tmp/warden/cgroup/#{subsystem}", "rw")
- end
- end
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.