kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 23:36:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #111 from vmarmol/docker-enable-memory

Browse source 
Enable the memory cgroup for the Docker plugin.
This commit is contained in:
Tiago Ilieve 2014-06-25 10:44:19 -03:00
commit 9592e2445e
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrapvz/plugins/docker_daemon/__init__.py
View file

@ -21,3 +21,4 @@ def resolve_tasks(taskset, manifest):
taskset.add(tasks.AddDockerDeps) taskset.add(tasks.AddDockerDeps)
taskset.add(tasks.AddDockerBinary) taskset.add(tasks.AddDockerBinary)
taskset.add(tasks.AddDockerInit) taskset.add(tasks.AddDockerInit)
taskset.add(tasks.EnableMemoryCgroup)

15
bootstrapvz/plugins/docker_daemon/tasks.py
View file

@ -1,6 +1,8 @@
from bootstrapvz.base import Task from bootstrapvz.base import Task
from bootstrapvz.common import phases from bootstrapvz.common import phases
from bootstrapvz.common.tasks import boot
from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import initd
from bootstrapvz.providers.gce.tasks import boot as gceboot
import os import os
import os.path import os.path
import shutil import shutil
@ -45,3 +47,16 @@ class AddDockerInit(Task):
default_src = os.path.join(ASSETS_DIR, 'default/docker') default_src = os.path.join(ASSETS_DIR, 'default/docker')
default_dest = os.path.join(info.root, 'etc/default/docker') default_dest = os.path.join(info.root, 'etc/default/docker')
shutil.copy(default_src, default_dest) shutil.copy(default_src, default_dest)
class EnableMemoryCgroup(Task):
description = 'Change grub configuration to enable the memory cgroup'
phase = phases.system_modification
successors = [boot.InstallGrub]
predecessors = [boot.ConfigureGrub, gceboot.ConfigureGrub]
@classmethod
def run(cls, info):
from bootstrapvz.common.tools import sed_i
grub_config = os.path.join(info.root, 'etc/default/grub')
sed_i(grub_config, r'^(GRUB_CMDLINE_LINUX*=".*)"\s*$', r'\1 cgroup_enable=memory"')