Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemory

daemon: execdriver: lxc: fix wrong template value passed to lxc conf
This commit is contained in:
Tibor Vass 2015-09-21 16:34:34 -04:00
Родитель 0c71c19239 7b4f73ee6c
Коммит da82b5fedb
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -96,8 +96,8 @@ lxc.cgroup.memory.soft_limit_in_bytes = {{.Resources.Memory}}
lxc.cgroup.memory.memsw.limit_in_bytes = {{$memSwap}}
{{end}}
{{end}}
{{if .Resources.KernelMemory}}
lxc.cgroup.memory.kmem.limit_in_bytes = {{.Resources.Memory}}
{{if gt .Resources.KernelMemory 0}}
lxc.cgroup.memory.kmem.limit_in_bytes = {{.Resources.KernelMemory}}
{{end}}
{{if .Resources.CPUShares}}
lxc.cgroup.cpu.shares = {{.Resources.CPUShares}}