Merge branch 'master' into docs-fixes

Andrew8305 · Mar 9, 2016 · ea3daaa · ea3daaa
2 parents 0dc0da1 + 5751ccf
commit ea3daaa
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/roles/mesos/templates/mesos-slave.service.j2 b/roles/mesos/templates/mesos-slave.service.j2
@@ -34,6 +34,9 @@ ExecStart=/usr/bin/docker run --rm --name mesos_slave \
 -e "MESOS_WORK_DIR={{ mesos_slave_work_dir }}" \
 -e "MESOS_LOG_DIR=/var/log/mesos" \
 -e "MESOS_HOSTNAME={{ mesos_hostname }}" \
+-e "MESOS_ISOLATION=cgroups/cpu,cgroups/mem" \
+-e "MESOS_CGROUPS_ROOT=system.slice/mesos-slave.service" \
+-e "MESOS_CGROUPS_HIERARCHY=/sys/fs/cgroup" \
 {{ mesos_slave_image }}
 
 ExecStop=/usr/bin/docker stop mesos_slave