saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #42631 from jeduardo/lxc-consistency-fixes

Browse source 
Fix lxc module to operate as per the docs for container memory configuration
This commit is contained in:
Mike Place 2017-08-01 13:02:38 -05:00 • committed by GitHub
commit 1b9cb26f2e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/lxc.py
View file

@ -894,7 +894,8 @@ def _get_lxc_default_data(**kwargs):
ret['lxc.start.auto'] = '0'
memory = kwargs.get('memory')
if memory is not None:
ret['lxc.cgroup.memory.limit_in_bytes'] = memory * 1024
# converting the config value from MB to bytes
ret['lxc.cgroup.memory.limit_in_bytes'] = memory * 1024 * 1024
cpuset = kwargs.get('cpuset')
if cpuset:
ret['lxc.cgroup.cpuset.cpus'] = cpuset