Merge pull request #592 from docker/cpusetcpus

Set 'CpusetCpus' with the value of the cpuset param in create_container
This commit is contained in:
Joffrey F 2015-05-08 11:42:25 -07:00
commit 8261a9175e
2 changed files with 2 additions and 0 deletions

View File

@ -577,6 +577,7 @@ def create_container_config(
'Entrypoint': entrypoint,
'CpuShares': cpu_shares,
'Cpuset': cpuset,
'CpusetCpus': cpuset,
'WorkingDir': working_dir,
'MemorySwap': memswap_limit,
'HostConfig': host_config,

View File

@ -489,6 +489,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase):
"StdinOnce": false,
"NetworkDisabled": false,
"Cpuset": "0,1",
"CpusetCpus": "0,1",
"MemorySwap": 0}'''))
self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'})